[389-console/f21] Bug 1022104 - remove versioned jars from %{_javadir}

Mark Reynolds mreynolds at fedoraproject.org
Fri Aug 29 17:03:48 UTC 2014


commit 37c605b61834514661c17f2b4b6942354e9e9447
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Fri Aug 29 13:03:03 2014 -0400

    Bug 1022104 -  remove versioned jars from %{_javadir}
    
    (cherry picked from commit d6a16d771b6c454184dac6c04b85c90803c47573)

 389-console.spec |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/389-console.spec b/389-console.spec
index 10a8074..23b616b 100644
--- a/389-console.spec
+++ b/389-console.spec
@@ -6,7 +6,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -15,7 +15,7 @@ URL: http://port389.org
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/binaries/%{name}-%{version}.tar.bz2
 Requires: idm-console-framework
 Requires: java-headless >= 1:1.6.0
 Requires: jpackage-utils
@@ -63,25 +63,20 @@ EOF
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.conf
 %jpackage_script com.netscape.management.client.console.Console "" "" jss4.jar:ldapjdk.jar:idm-console-base.jar:idm-console-mcc.jar:idm-console-mcc_%{consolelang}.jar:idm-console-nmclf.jar:idm-console-nmclf_%{consolelang}.jar %{name} true
 
-# create symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}_%{consolelang}.jar %{name}-%{major_version}_%{consolelang}.jar
-ln -s %{name}-%{version}_%{consolelang}.jar %{name}_%{consolelang}.jar
-popd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_javadir}/%{name}-%{version}_%{consolelang}.jar
-%{_javadir}/%{name}-%{major_version}_%{consolelang}.jar
 %{_javadir}/%{name}_%{consolelang}.jar
 %{_bindir}/%{name}
 %{_sysconfdir}/java/%{name}.conf
 
 %changelog
+* Fri Aug 29 2014 Mark Reynolds <mreynolds at redhat.com> - 1.1.7-8
+- Bug 1022104 -  remove versioned jars from %{_javadir}
+
 * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -148,5 +143,5 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jul 27 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-2
 - Modified package name to be less generic.
 
-* Mon Jul 26 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-1
+* Mon Jul 23 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-1
 - Initial creation


More information about the scm-commits mailing list