SPECS (DEVEL): fop.spec - fixed %%install and %%files sections. - it builds...

pawelz pawelz at pld-linux.org
Mon Dec 29 17:31:41 CET 2008


Author: pawelz                       Date: Mon Dec 29 16:31:41 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- fixed %%install and %%files sections.
- it builds now (without tests)

---- Files affected:
SPECS:
   fop.spec (1.36.2.5 -> 1.36.2.6) 

---- Diffs:

================================================================
Index: SPECS/fop.spec
diff -u SPECS/fop.spec:1.36.2.5 SPECS/fop.spec:1.36.2.6
--- SPECS/fop.spec:1.36.2.5	Mon Dec 29 17:22:21 2008
+++ SPECS/fop.spec	Mon Dec 29 17:31:36 2008
@@ -2,6 +2,7 @@
 # TODO:
 # - Some test fails. Reason of some failures is obvious:
 #   [junit] No X11 DISPLAY variable was set, but this program performed an operation which requires it.
+# - Where should we %%install fop.war file?
 #
 # Conditional build:
 %bcond_without  tests           # build without tests
@@ -102,7 +103,12 @@
 # create empty config file
 echo > $RPM_BUILD_ROOT%{_fontsdir}/fop-font.config
 
-install lib/avalon-framework-cvs-20020806.jar build/fop.jar $RPM_BUILD_ROOT%{_javadir}
+cd build
+for jar in fop*.jar; do
+  base=$(basename $jar .jar)
+  install $jar $RPM_BUILD_ROOT%{_javadir}/$base-%{version}.jar
+  ln -s $base-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$base.jar
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,11 +118,12 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README STATUS
+%doc KEYS NOTICE README known-issues.xml
 %dir %{_fop_font_metrics}
-%attr(755,root,root) %{_bindir}/*
-%{_javadir}/*.jar
-%{_fontsdir}/*.config
+%attr(755,root,root) %{_bindir}/fop
+%attr(755,root,root) %{_bindir}/fop-font-install
+%{_javadir}/fop*.jar
+%{_fontsdir}/fop-font.config
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -124,6 +131,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36.2.6  2008/12/29 16:31:36  pawelz
+- fixed %%install and %%files sections.
+- it builds now (without tests)
+
 Revision 1.36.2.5  2008/12/29 16:22:21  pawelz
 - %%builds but not %%installs
 - still does not pass tests. Which package provides ConsoleLogger class?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fop.spec?r1=1.36.2.5&r2=1.36.2.6&f=u



More information about the pld-cvs-commit mailing list