[389-commits] 389-console.spec build.xml fedora-idm-console.spec

[Mark Reynolds]

 389-console.spec        |   12 ++----------
 build.xml               |    4 ++--
 fedora-idm-console.spec |   12 ++----------
 3 files changed, 6 insertions(+), 22 deletions(-)

New commits:
commit 63be739dc92ed6437bca2eb250ce024548243420
Author: Mark Reynolds <mreynolds(a)redhat.com&gt;
Date:   Fri Aug 29 11:50:09 2014 -0400

    Ticket 47604 - 389-console: remove versioned jars from %{_javadir}
    
    Bug Description:  Versioned files cause problems for automatic
                      requires generation and violate packaging guidelines.
    
    Fix Description:  Remove the version from the jar files.  The spec files
                      are just a template, the real spec files will be updated
                      separately.
    
    https://fedorahosted.org/389/ticket/47604
    
    Reviewed by: rmeggins(Thanks!)

diff --git a/389-console.spec b/389-console.spec
index 9f5100c..46d3d47 100755
--- a/389-console.spec
+++ b/389-console.spec
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 3
+%define minor_version 7
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
@@ -12,7 +12,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 >= 1.1
 Requires: java >= 1:1.6.0
 BuildRequires: ant >= 1.6.2
@@ -47,20 +47,12 @@ install -m755 built/%{name} $RPM_BUILD_ROOT/%{_bindir}
 install -d $RPM_BUILD_ROOT%{_mandir}/man8
 install -m built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8
 
-# create symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
-ln -s %{name}-%{version}_en.jar %{name}_en.jar
-popd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_javadir}/%{name}-%{version}_en.jar
-%{_javadir}/%{name}-%{major_version}_en.jar
 %{_javadir}/%{name}_en.jar
 %{_bindir}/%{name}
 %{_mandir}
diff --git a/build.xml b/build.xml
index 2e4a4ab..5ca1dd8 100644
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,7 @@ END COPYRIGHT BLOCK
 
   <target name="buildjar" depends="prepare">
     <!-- Create the theme jar file -->
-    <jar jarfile="${built.dir}/${theme.name}_${lang}.jar" >
+    <jar jarfile="${built.dir}/${theme.core}_${lang}.jar" >
       <fileset dir="${console.root}">
          <include name="com/netscape/management/client/theme/**" />
          <exclude name="com/netscape/management/client/theme/**/*.xcf"
/>
@@ -111,7 +111,7 @@ END COPYRIGHT BLOCK
       <replacefilter token="@mcclangjar@"
value="${console.mcc.name}_${lang}.jar"/>
       <replacefilter token="@nmclfjar@"
value="${console.nmclf.name}.jar"/>
       <replacefilter token="@nmclflangjar@"
value="${console.nmclf.name}_${lang}.jar"/>
-      <replacefilter token="@themejar@"
value="${theme.name}_${lang}.jar"/>
+      <replacefilter token="@themejar@"
value="${theme.core}_${lang}.jar"/>
       <replacefilter token="@prefsdir@"
value="${theme.core}"/>
       <replacefilter token="@libdir@" value="${lib.dir}"/>
       <replacefilter token="@need_libdir@"
value="${need_libdir}"/>
diff --git a/fedora-idm-console.spec b/fedora-idm-console.spec
index 8b2dedc..aec831e 100755
--- a/fedora-idm-console.spec
+++ b/fedora-idm-console.spec
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 3
+%define minor_version 7
 
 Name: fedora-idm-console
 Version: %{major_version}.%{minor_version}
@@ -11,7 +11,7 @@ License: LGPLv2
 URL: http://directory.fedoraproject.org
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/binaries/%{name}-%{version}.tar.bz2
 Requires: idm-console-framework >= 1.1
 Requires: java >= 1:1.6.0
 BuildRequires: ant >= 1.6.2
@@ -39,20 +39,12 @@ install -m644 built/*.jar $RPM_BUILD_ROOT%{_javadir}
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -m755 built/%{name} $RPM_BUILD_ROOT/%{_bindir}
 
-# create symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
-ln -s %{name}-%{version}_en.jar %{name}_en.jar
-popd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_javadir}/%{name}-%{version}_en.jar
-%{_javadir}/%{name}-%{major_version}_en.jar
 %{_javadir}/%{name}_en.jar
 %{_bindir}/%{name}