[javatar] Ship unversioned jars (bug #1022111)

Orion Poplawski orion at fedoraproject.org
Tue Oct 22 15:55:51 UTC 2013


commit 3d55a96c9fc4b18121af66828b0697a6c0945a5e
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Oct 22 09:55:55 2013 -0600

    Ship unversioned jars (bug #1022111)

 javatar.spec |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/javatar.spec b/javatar.spec
index 1cb5110..bd19ec6 100644
--- a/javatar.spec
+++ b/javatar.spec
@@ -1,6 +1,6 @@
 Name:           javatar
 Version:        2.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Java tar archive io package
 
 Group:          Development/Libraries
@@ -55,10 +55,8 @@ ant -buildfile source/com/ice/tar/build.xml deploy
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p tar-%{version}/jars/tar.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/tar.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
 cp -rp doc $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
@@ -71,9 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc doc/LICENSE
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
-%{_javadir}/tar-%{version}.jar
 %{_javadir}/tar.jar
 
 %files javadoc
@@ -83,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 22 2013 Orion Poplawski <orion at cora.nwra.com> - 2.5-11
+- Ship unversioned jars (bug #1022111)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list