From 5f444749b4acfbeffc4276196bd0a1f704ef67ed Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Jun 24 2013 21:11:41 +0000 Subject: Build from clean tarball - Spec file clean up Signed-off-by: Mikolaj Izdebski --- diff --git a/.gitignore b/.gitignore index 93e4d32..ccfeeb2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ fop-0.95-src.tar.gz fop-1.0-src.tar.gz /event-model.tgz /fop-1.1-src.tar.gz +/fop-1.1-clean.tar.gz diff --git a/clean-tarball.sh b/clean-tarball.sh new file mode 100755 index 0000000..abdde65 --- /dev/null +++ b/clean-tarball.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then + echo "Usage: ./clean-tarball VERSION" + exit 1 +fi + +VERSION=${1} +NAME="fop" + +wget http://archive.apache.org/dist/xmlgraphics/fop/source/${NAME}-${VERSION}-src.tar.gz +tar xvf ${NAME}-${VERSION}-src.tar.gz + +( + cd ${NAME}-${VERSION} + # non-free color profile + find src/java/org/apache/fop/pdf/ -name "*.icm*" -delete + find ./ -name "*.jar" -delete + find ./ -name "*.pdf" -delete + # serialized objects + find ./${NAME}-${VERSION}/ -name "*.ser" -delete + # examples, tests, ... + rm -Rf lib/ examples/ test/ hyph/ + rm -Rf src/documentation/ + mkdir -p lib/build/ +) + +tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} +rm -Rf ${NAME}-${VERSION}.tar.gz + diff --git a/fop.spec b/fop.spec index 5fe9470..895e5cc 100644 --- a/fop.spec +++ b/fop.spec @@ -1,25 +1,19 @@ -Summary: XSL-driven print formatter Name: fop +Summary: XSL-driven print formatter Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 -Group: Applications/Text URL: http://xmlgraphics.apache.org/fop -# wget http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz -# tar xzvf fop-%{version}-src.tar.gz -# find ./fop-%{version}/src/java/org/apache/fop/pdf/ -name "*.icm*" -delete -# find ./fop-%{version}/ -name "*.jar" -delete -# find ./fop-%{version}/ -name "*.pdf" -delete -# we don't run tests, we don't need test data -# find ./fop-%{version}/ -name "*.ser" -delete -# tar czvf fop-%{version}-src.tar.gz fop-%{version} -Source0: %{name}-%{version}-src.tar.gz +# ./clean-tarball %{version} +Source0: %{name}-%{version}-clean.tar.gz Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom Patch0: %{name}-main.patch Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch -BuildArch: noarch + +BuildArch: noarch + Requires: xmlgraphics-commons >= 1.5 Requires: avalon-framework >= 4.1.4 Requires: batik >= 1.7 @@ -28,17 +22,11 @@ Requires: xml-commons-apis >= 1.3.04 Requires: jakarta-commons-httpclient Requires: apache-commons-io >= 1.2 Requires: apache-commons-logging >= 1.0.4 -Requires: java >= 1:1.6.0 +Requires: java Requires: icc-profiles-openicc -Requires: jpackage-utils - -Requires(post): jpackage-utils -Requires(postun): jpackage-utils BuildRequires: ant -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: java-javadoc >= 1:1.6.0 -BuildRequires: jpackage-utils +BuildRequires: java-devel BuildRequires: apache-commons-logging BuildRequires: apache-commons-io BuildRequires: avalon-framework @@ -60,8 +48,6 @@ XT) SAX events. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -71,9 +57,6 @@ Javadoc for %{name}. %patch0 -p0 %patch1 -p1 -find -name '*.class' -exec rm -f '{}' \; -find -name '*.jar' -exec rm -f '{}' \; - sed -i -e "s|1.4|1.5|g" build.xml #upstream workaround -- many thanks to spepping@apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 @@ -86,61 +69,52 @@ ant jar-main transcoder-pkg javadocs %install # inject OSGi manifests -mkdir -p META-INF -cp -p %{SOURCE2} META-INF/MANIFEST.MF +install -d -m 755 META-INF +install -p -m 644 %{SOURCE2} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u build/%{name}.jar META-INF/MANIFEST.MF # jars -mkdir -p %{buildroot}%{_javadir} -cp -a build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar -cp -a build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar +install -p -m 644 build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar # script -mkdir -p %{buildroot}%{_bindir} -cp -a %{SOURCE1} %{buildroot}%{_bindir}/fop +install -d -m 755 %{buildroot}%{_bindir} +install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/fop # data -mkdir -p %{buildroot}%{_datadir}/%{name} -cp -a conf %{buildroot}%{_datadir}/%{name} +install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf +cp -rp conf/* %{buildroot}%{_datadir}/%{name}/conf # javadoc -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -a build/javadocs/* %{buildroot}%{_javadocdir}/%{name} - -mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} -cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name} %{version} - -%pre javadoc -# workaround for rpm bug 646523, can be removed in F-17 -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -rp build/javadocs/* %{buildroot}%{_javadocdir}/%{name} -%post -%update_maven_depmap - -%postun -%update_maven_depmap +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files -%defattr(-,root,root,-) %doc LICENSE README NOTICE %{_javadir}/%{name}.jar %{_datadir}/%{name} %{_javadir}/pdf-transcoder.jar -%{_mavendepmapfragdir}/* -%{_mavenpomdir}/*pom -%attr(0755,root,root) %{_bindir}/fop +%{_mavendepmapfragdir}/%{name} +%{_mavenpomdir}/JPP-%{name}.pom +%{_bindir}/fop %files javadoc -%defattr(-,root,root,-) %doc %{_javadocdir}/%{name} %doc LICENSE %changelog +* Fri Jun 21 2013 Michal Srb - 1.1-2 +- Build from clean tarball +- Spec file clean up + * Fri Apr 12 2013 Michal Srb - 1.1-1 - Update to upstream version 1.1 - Replace proprietary color profile with free CP from icc-profiles-openicc package diff --git a/sources b/sources index 194b282..5244438 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ff020ee2b403bebe373ff3827d0a9b2 fop-1.1-src.tar.gz +0eaef1991f1dbc1fcfb238c918cecbf3 fop-1.1-clean.tar.gz