From 940358ca41d42e38bbd93b00c78a4f95b4d2348e Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Aug 29 2014 16:42:11 +0000
Subject: Ticket 47604 - idm-console-framework: 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.  idm-console-framework.spec
                  is just a template, the real spec files will be updated separately.

https://fedorahosted.org/389/ticket/47604

Reviewed by: rmeggins(Thanks!)

---

diff --git a/build.properties b/build.properties
index e14ac96..c5968d9 100755
--- a/build.properties
+++ b/build.properties
@@ -27,16 +27,8 @@ console.dotversion=1.1.7
 console.dotgenversion=1.1
 
 mcc.core=idm-console-mcc
-mcc.name=${mcc.core}-${console.dotversion}
-mcc.gen.name=${mcc.core}-${console.dotgenversion}
-
 nmclf.core=idm-console-nmclf
-nmclf.name=${nmclf.core}-${console.dotversion}
-nmclf.gen.name=${nmclf.core}-${console.dotgenversion}
-
 base.core=idm-console-base
-base.name=${base.core}-${console.dotversion}
-base.gen.name=${base.core}-${console.dotgenversion}
 
 jss.jar.name=jss4.jar
 ldapjdk.jar.name=ldapjdk.jar
diff --git a/build.xml b/build.xml
index a5bed9c..41125ab 100644
--- a/build.xml
+++ b/build.xml
@@ -188,7 +188,7 @@ END COPYRIGHT BLOCK
   <!-- Package -->
   <target name="build_jars" depends="build,prepare_jars">
     <!-- Create jar files -->
-    <jar jarfile="${built.jardir}/${mcc.name}.jar" >
+    <jar jarfile="${built.jardir}/${mcc.core}.jar" >
       <fileset dir="${built.classdir}">
          <include name="com/netscape/management/client/**/*.class" />
          <include name="sun/net/www/protocol/https/**/*.class" />
@@ -211,26 +211,26 @@ END COPYRIGHT BLOCK
          <exclude name="com/netscape/management/client/console/VersionInfo.class"/>
       </fileset>
     </jar>
-    <jar jarfile="${built.jardir}/${mcc.name}_${lang}.jar" >
+    <jar jarfile="${built.jardir}/${mcc.core}_${lang}.jar" >
       <fileset dir="${java.src.dir}">
          <include name="com/netscape/management/client/**/*.properties" />
          <include name="com/netscape/management/client/**/*.gif" />
          <include name="com/netscape/management/client/**/*.jpg" />
       </fileset>
     </jar>
-    <jar jarfile="${built.jardir}/${nmclf.name}.jar" >
+    <jar jarfile="${built.jardir}/${nmclf.core}.jar" >
       <fileset dir="${built.classdir}">
          <include name="com/netscape/management/nmclf/**/*.class" />
       </fileset>
     </jar>
-    <jar jarfile="${built.jardir}/${nmclf.name}_${lang}.jar" >
+    <jar jarfile="${built.jardir}/${nmclf.core}_${lang}.jar" >
       <fileset dir="${java.src.dir}">
          <include name="com/netscape/management/nmclf/**/*.properties" />
          <include name="com/netscape/management/nmclf/**/*.gif" />
          <include name="com/netscape/management/nmclf/**/*.jpg" />
       </fileset>
     </jar>
-    <jar jarfile="${built.jardir}/${base.name}.jar" >
+    <jar jarfile="${built.jardir}/${base.core}.jar" >
       <fileset dir="${built.classdir}">
         <include name="com/netscape/management/client/topology/IServerObject.class"/>
         <include name="com/netscape/management/client/topology/IRemovableServerObject.class"/>
@@ -256,27 +256,11 @@ END COPYRIGHT BLOCK
   <!-- Package -->
   <target name="package" depends="build_jars,prepare_package,import_jss_lib,import_nss_lib,import_nspr_lib">
     <!-- Copy built jars to packaging area -->
-    <copy file="${built.jardir}/${mcc.name}.jar" todir="${java.dir}"/>
-    <copy file="${built.jardir}/${mcc.name}_${lang}.jar" todir="${java.dir}"/>
-    <copy file="${built.jardir}/${nmclf.name}.jar" todir="${java.dir}"/>
-    <copy file="${built.jardir}/${nmclf.name}_${lang}.jar" todir="${java.dir}"/>
-    <copy file="${built.jardir}/${base.name}.jar" todir="${java.dir}"/>
-    <!-- make a symlinks: e.g., prefix-mcc-1.0.0.jar to prefix-mcc-1.0.jar -->
-    <exec executable="ln" dir="${java.dir}" vmlauncher="true">
-      <arg line="-s ${mcc.name}.jar ${mcc.gen.name}.jar"/>
-    </exec>
-    <exec executable="ln" dir="${java.dir}" vmlauncher="true">
-      <arg line="-s ${mcc.name}_${lang}.jar ${mcc.gen.name}_${lang}.jar"/>
-    </exec>
-    <exec executable="ln" dir="${java.dir}" vmlauncher="true">
-      <arg line="-s ${nmclf.name}.jar ${nmclf.gen.name}.jar"/>
-    </exec>
-    <exec executable="ln" dir="${java.dir}" vmlauncher="true">
-      <arg line="-s ${nmclf.name}_${lang}.jar ${nmclf.gen.name}_${lang}.jar"/>
-    </exec>
-    <exec executable="ln" dir="${java.dir}" vmlauncher="true">
-      <arg line="-s ${base.name}.jar ${base.gen.name}.jar"/>
-    </exec>
+    <copy file="${built.jardir}/${mcc.core}.jar" todir="${java.dir}"/>
+    <copy file="${built.jardir}/${mcc.core}_${lang}.jar" todir="${java.dir}"/>
+    <copy file="${built.jardir}/${nmclf.core}.jar" todir="${java.dir}"/>
+    <copy file="${built.jardir}/${nmclf.core}_${lang}.jar" todir="${java.dir}"/>
+    <copy file="${built.jardir}/${base.core}.jar" todir="${java.dir}"/>
 
     <!-- Copy components into packaging area -->
     <copy file="${ldapjdk.local.location}/${ldapjdk.jar.name}" todir="${java.dir}"/>
diff --git a/idm-console-framework.spec b/idm-console-framework.spec
index c5745e1..317cb96 100755
--- a/idm-console-framework.spec
+++ b/idm-console-framework.spec
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 3
+%define minor_version 7
 
 Name: idm-console-framework
 Version: %{major_version}.%{minor_version}
@@ -12,7 +12,7 @@ URL: http://directory.fedoraproject.org
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/binaries/%{name}-%{version}.tar.bz2
 Requires: ldapjdk
 Requires: jss >= 4.2
 # Urge use of OpenJDK for runtime
@@ -39,40 +39,16 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 install -m644 built/release/jars/idm-console-* $RPM_BUILD_ROOT%{_javadir}
 
-# create symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s idm-console-base-%{version}.jar idm-console-base-%{major_version}.jar
-ln -s idm-console-base-%{version}.jar idm-console-base.jar
-ln -s idm-console-mcc-%{version}.jar idm-console-mcc-%{major_version}.jar
-ln -s idm-console-mcc-%{version}.jar idm-console-mcc.jar
-ln -s idm-console-mcc-%{version}_en.jar idm-console-mcc-%{major_version}_en.jar
-ln -s idm-console-mcc-%{version}_en.jar idm-console-mcc_en.jar
-ln -s idm-console-nmclf-%{version}.jar idm-console-nmclf-%{major_version}.jar
-ln -s idm-console-nmclf-%{version}.jar idm-console-nmclf.jar
-ln -s idm-console-nmclf-%{version}_en.jar idm-console-nmclf-%{major_version}_en.jar
-ln -s idm-console-nmclf-%{version}_en.jar idm-console-nmclf_en.jar
-popd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_javadir}/idm-console-base-%{version}.jar
-%{_javadir}/idm-console-base-%{major_version}.jar
 %{_javadir}/idm-console-base.jar
-%{_javadir}/idm-console-mcc-%{version}.jar
-%{_javadir}/idm-console-mcc-%{major_version}.jar
 %{_javadir}/idm-console-mcc.jar
-%{_javadir}/idm-console-mcc-%{version}_en.jar
-%{_javadir}/idm-console-mcc-%{major_version}_en.jar
 %{_javadir}/idm-console-mcc_en.jar
-%{_javadir}/idm-console-nmclf-%{version}.jar
-%{_javadir}/idm-console-nmclf-%{major_version}.jar
 %{_javadir}/idm-console-nmclf.jar
-%{_javadir}/idm-console-nmclf-%{version}_en.jar
-%{_javadir}/idm-console-nmclf-%{major_version}_en.jar
 %{_javadir}/idm-console-nmclf_en.jar
 
 %changelog