[jeuclid] Fix dependency on fop.

[Alexander Kurtakov]

commit b982c9c89e614253848a12239edba0222a2be8bd
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Mar 25 08:38:46 2011 +0200

    Fix dependency on fop.
    
    Adapt to current guidelines

 jeuclid.spec |   41 +++++++++++++++++------------------------
 1 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/jeuclid.spec b/jeuclid.spec
index 3747ea3..afd950f 100644
--- a/jeuclid.spec
+++ b/jeuclid.spec
@@ -1,6 +1,6 @@
 Name:		jeuclid
 Version:	3.1.3
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	MathML rendering solution
 Group:		Development/Libraries
 License:	ASL 2.0 and SPL
@@ -26,17 +26,17 @@ BuildRequires:	jpackage-utils
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	ant
 BuildRequires:	batik >= 1.7 
-BuildRequires:	jakarta-commons-logging
+BuildRequires:	apache-commons-logging
 BuildRequires:	jcip-annotations
 BuildRequires:	xmlgraphics-commons >= 1.3
-BuildRequires:	fop = 0.95
-BuildRequires:	jakarta-commons-cli >= 1.1
-BuildRequires:	jakarta-commons-lang
+BuildRequires:	fop >= 0.95
+BuildRequires:	apache-commons-cli >= 1.1
+BuildRequires:	apache-commons-lang
 BuildRequires:	desktop-file-utils
 
 Requires:	jpackage-utils
 Requires:	java >= 1:1.6.0
-Requires:	jakarta-commons-logging
+Requires:	apache-commons-logging
 Requires:	batik >= 1.7
 Requires:	xmlgraphics-commons >= 1.3	
 Requires:	jcip-annotations
@@ -57,7 +57,7 @@ The %{name}-mathviewer package contains the Swing MathViewer application.
 Summary:	JEuclid plug-in for FOP
 Group:		Applications/Publishing
 Requires:	%{name} = %{version}-%{release}
-Requires:	fop = 0.95
+Requires:	fop >= 0.95
 
 %description	fop
 The %{name}-fop package is a jeuclid plug-in for FOP.
@@ -66,8 +66,8 @@ The %{name}-fop package is a jeuclid plug-in for FOP.
 Summary:	Command line interface for Jeuclid
 Group:		Applications/Publishing
 Requires:	%{name} = %{version}-%{release}
-Requires:	jakarta-commons-cli >= 1.1
-Requires:	jakarta-commons-lang
+Requires:	apache-commons-cli >= 1.1
+Requires:	apache-commons-lang
 Requires:	jakarta-commons-io
 
 %description	cli
@@ -97,19 +97,15 @@ rm -f %{name}-core/src/main/java/net/sourceforge/jeuclid/converter/FreeHep*;
 ant compile-core compile-mathviewer compile-cli compile-fop -verbose 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p target/%{name}-core.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar
+$RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
 cp -p target/%{name}-fop.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-fop-%{version}.jar
+$RPM_BUILD_ROOT%{_javadir}/%{name}-fop.jar
 cp -p target/%{name}-mathviewer.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-mathviewer-%{version}.jar
+$RPM_BUILD_ROOT%{_javadir}/%{name}-mathviewer.jar
 cp -p target/%{name}-cli.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-cli-%{version}.jar
-
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+$RPM_BUILD_ROOT%{_javadir}/%{name}-cli.jar
 
 install -dm 755 $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/jeuclid-mathviewer
@@ -122,9 +118,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
 %{SOURCE2}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -140,12 +133,10 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc NOTICE LICENSE.txt README.Release
-%{_javadir}/%{name}-core-%{version}.jar
 %{_javadir}/%{name}-core.jar
 
 %files mathviewer
 %defattr(-,root,root,-)
-%{_javadir}/%{name}-mathviewer-%{version}.jar
 %{_javadir}/%{name}-mathviewer.jar
 %{_bindir}/jeuclid-mathviewer
 %{_datadir}/icons/hicolor/48x48/apps/jeuclid_48x48.png
@@ -153,16 +144,18 @@ fi
 
 %files fop
 %defattr(-,root,root,-)
-%{_javadir}/%{name}-fop-%{version}.jar
 %{_javadir}/%{name}-fop.jar
 
 %files cli 
 %defattr(-,root,root,-)
-%{_javadir}/%{name}-cli-%{version}.jar
 %{_javadir}/%{name}-cli.jar
 %{_bindir}/jeuclid-cli
 
 %changelog
+* Fri Mar 25 2011 Alexander Kurtakov <akurtako at redhat.com> 3.1.3-14
+- Fix dependency on fop.
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.3-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild