[libfonts/f19] Resolves: rhbz#1022131 remove versioned jars

Caolán McNamara caolanm at fedoraproject.org
Wed Oct 23 10:55:21 UTC 2013


commit ad90385a855f1c18530492b4a6be53986947110b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 23 11:55:22 2013 +0100

    Resolves: rhbz#1022131 remove versioned jars

 libfonts.spec |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/libfonts.spec b/libfonts.spec
index 231ac93..3595ba9 100644
--- a/libfonts.spec
+++ b/libfonts.spec
@@ -1,6 +1,6 @@
 Name: libfonts
 Version: 1.1.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: TrueType Font Layouting
 License: LGPLv2 and UCD
 Group: System Environment/Libraries
@@ -50,10 +50,7 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p ./dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar %{name}.jar
-popd
+cp -p ./dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -64,7 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(0644,root,root,0755)
 %doc licence-LGPL.txt README.txt ChangeLog.txt
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 
 %files javadoc
@@ -72,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Oct 23 2013 Caolán McNamara <caolanm at redhat.com> - 1.1.3-12
+- Resolves: rhbz#1022131 remove versioned jars
+
 * Tue Apr 02 2013 Caolán McNamara <caolanm at redhat.com> - 1.1.3-11
 - drop iText requirement, we don't need it, and it's a complete pain
 


More information about the scm-commits mailing list