[libfonts/f19] Revert: rhbz#1022131 remove versioned jars, wrong branch
Caolán McNamara
caolanm at fedoraproject.org
Wed Oct 23 14:26:30 UTC 2013
commit 1841e668420580d25d298693efea2d273152f129
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 23 15:26:31 2013 +0100
Revert: rhbz#1022131 remove versioned jars, wrong branch
libfonts.spec | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/libfonts.spec b/libfonts.spec
index 3595ba9..b501312 100644
--- a/libfonts.spec
+++ b/libfonts.spec
@@ -1,6 +1,6 @@
Name: libfonts
Version: 1.1.3
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: TrueType Font Layouting
License: LGPLv2 and UCD
Group: System Environment/Libraries
@@ -50,7 +50,10 @@ done
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p ./dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p ./dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -s %{name}-%{version}.jar %{name}.jar
+popd
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -61,6 +64,7 @@ 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
@@ -68,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/%{name}
%changelog
+* Wed Oct 23 2013 Caolán McNamara <caolanm at redhat.com> - 1.1.3-13
+- Revert: rhbz#1022131 remove versioned jars, wrong branch
+
* Wed Oct 23 2013 Caolán McNamara <caolanm at redhat.com> - 1.1.3-12
- Resolves: rhbz#1022131 remove versioned jars
More information about the scm-commits
mailing list