rpms/apache-commons-discovery/devel apache-commons-discovery.spec, 1.1, 1.2

[Stanislav Ochotnicky]

Author: sochotni

Update of /cvs/pkgs/rpms/apache-commons-discovery/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9959/devel

Modified Files:
	apache-commons-discovery.spec 
Log Message:
Add proper symlinks for unversioned jar files

also add obsoletes to javadoc subpackage




Index: apache-commons-discovery.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-discovery/devel/apache-commons-discovery.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apache-commons-discovery.spec	11 May 2010 07:24:49 -0000	1.1
+++ apache-commons-discovery.spec	12 May 2010 12:25:05 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          2
 Summary:        Apache Commons Discovery
 License:        ASL 2.0
@@ -40,6 +40,8 @@ Group:          Documentation
 Summary:        API documentation for %{name}
 Requires:       jpackage-utils
 
+Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
+
 %description javadoc
 %{summary}.
 
@@ -61,9 +63,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_java
 install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar %{short_name}-%{version}.jar
 for jar in *-%{version}.jar;
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`;
+    ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
+    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+    ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
 done
 popd # come back from javadir
 
@@ -86,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2:0.4-4
+- Add obsoletes to javadoc subpackage
+- Add proper symlinks for unversioned jar files
+
 * Fri May  7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2:0.4-3
 - Add jpackage-utils as dep for -javadoc subpackage