[itext] Remove versioned JARs
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Nov 22 14:23:35 UTC 2013
commit 6cbd2d62833b59992adc406f33840e1218ff1183
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Nov 7 15:34:15 2013 +0100
Remove versioned JARs
- Resolves: rhbz#1022106
itext.spec | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/itext.spec b/itext.spec
index 905c2ee..69d9be1 100644
--- a/itext.spec
+++ b/itext.spec
@@ -8,7 +8,7 @@
Summary: A Free Java-PDF library
Name: itext
Version: 2.1.7
-Release: 22%{?dist}
+Release: 23%{?dist}
#src/toolbox/com/lowagie/toolbox/Versions.java is MPLv1.1 or MIT
#src/toolbox/com/lowagie/toolbox/plugins/XML2Bookmarks.java is MPLv1.1 or LGPLv2+
#src/rups/com/lowagie/rups/Rups.java is LGPLv2+
@@ -222,15 +222,13 @@ popd
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p lib/iText.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
cp -p lib/iText-rtf.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-rtf-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-rtf.jar
cp -p lib/iText-rups.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-rups-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-rups.jar
cp -p lib/iText-toolbox.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-toolbox-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do \
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-toolbox.jar
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -317,32 +315,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc build/bin/com/lowagie/text/{apache_license,lgpl,misc_licenses,MPL-1.1}.txt
%if %{with_gcj}
%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/%{name}-%{version}.*
+%{_libdir}/gcj/%{name}/%{name}.*
# We only need the aot bits for the core jar
-%exclude %{_libdir}/gcj/%{name}/%{name}-rtf-%{version}.*
-%exclude %{_libdir}/gcj/%{name}/%{name}-rups-%{version}.*
-%exclude %{_libdir}/gcj/%{name}/%{name}-toolbox-%{version}.*
+%exclude %{_libdir}/gcj/%{name}/%{name}-rtf.*
+%exclude %{_libdir}/gcj/%{name}/%{name}-rups.*
+%exclude %{_libdir}/gcj/%{name}/%{name}-toolbox.*
%endif
%files core
%doc build/bin/com/lowagie/text/{apache_license,lgpl,misc_licenses,MPL-1.1}.txt
%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
%{_mavenpomdir}/JPP-itext.pom
%{_mavendepmapfragdir}/%{name}
%files rtf
%doc build/bin/com/lowagie/text/{lgpl,misc_licenses,MPL-1.1}.txt
%{_javadir}/%{name}-rtf.jar
-%{_javadir}/%{name}-rtf-%{version}.jar
%{_mavenpomdir}/JPP-%{name}-rtf.pom
%{_mavendepmapfragdir}/%{name}-rtf
%files rups
%doc src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
%{_javadir}/%{name}-rups.jar
-%{_javadir}/%{name}-rups-%{version}.jar
%{_mavenpomdir}/JPP-%{name}-rups.pom
%{_mavendepmapfragdir}/%{name}-rups
%{_bindir}/%{name}-rups
@@ -353,7 +348,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc build/bin/com/lowagie/text/{misc_licenses,MPL-1.1}.txt
%doc src/toolbox/com/lowagie/toolbox/tools.txt
%{_javadir}/%{name}-toolbox.jar
-%{_javadir}/%{name}-toolbox-%{version}.jar
%{_bindir}/%{name}-toolbox
%{_datadir}/applications/%{name}-toolbox.desktop
%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
@@ -365,6 +359,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# -----------------------------------------------------------------------------
%changelog
+* Thu Nov 7 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1.7-23
+- Remove versioned JARs
+- Resolves: rhbz#1022106
+
* Fri Oct 04 2013 gil cattaneo <puntogil at libero.it> 2.1.7-22
- fix badurl (source file audit - 2013-09-30)
More information about the scm-commits
mailing list