packages: java-flow-engine/java-flow-engine.spec - update deps, builds now

[glen]

Author: glen                         Date: Sun Oct 23 18:59:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update deps, builds now

---- Files affected:
packages/java-flow-engine:
   java-flow-engine.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-flow-engine/java-flow-engine.spec
diff -u packages/java-flow-engine/java-flow-engine.spec:1.1 packages/java-flow-engine/java-flow-engine.spec:1.2
--- packages/java-flow-engine/java-flow-engine.spec:1.1	Sat Oct 22 15:32:38 2011
+++ packages/java-flow-engine/java-flow-engine.spec	Sun Oct 23 20:59:27 2011
@@ -8,7 +8,7 @@
 Summary:	Pentaho Flow Reporting Engine
 Name:		java-%{srcname}
 Version:	0.9.4
-Release:	0.1
+Release:	1
 License:	LGPL v2+
 Group:		Libraries/Java
 Source0:	http://downloads.sourceforge.net/jfreereport/%{srcname}-%{version}.zip
@@ -16,28 +16,28 @@
 BuildRequires:	ant
 BuildRequires:	java-flute
 BuildRequires:	java-libbase
+BuildRequires:	java-libfonts
+BuildRequires:	java-libformula
+BuildRequires:	java-liblayout
 BuildRequires:	java-libloader
+BuildRequires:	java-librepository
+BuildRequires:	java-libserializer
 BuildRequires:	java-libxml
 BuildRequires:	java-sac
 BuildRequires:	java-xml-commons
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	libfonts
-BuildRequires:	libformula
-BuildRequires:	liblayout
-BuildRequires:	librepository
-BuildRequires:	libserializer
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	java-flute
 Requires:	java-libbase >= 1.1.3
+Requires:	java-libfonts >= 1.1.3
+Requires:	java-libformula >= 1.1.3
+Requires:	java-liblayout >= 0.2.10
+Requires:	java-librepository >= 1.1.3
+Requires:	java-libserializer
 Requires:	java-libxml
 Requires:	java-sac
 Requires:	jpackage-utils
-Requires:	libfonts >= 1.1.3
-Requires:	libformula >= 1.1.3
-Requires:	liblayout >= 0.2.10
-Requires:	librepository >= 1.1.3
-Requires:	libserializer
 Obsoletes:	pentaho-reporting-flow-engine
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,7 +57,7 @@
 %prep
 %setup -qc
 install -d lib
-find -name "*.jar" | xargs rm -v
+find -name "*.jar" | xargs -r rm -v
 
 %build
 build-jar-repository -s -p lib commons-logging-api libbase libloader \
@@ -71,7 +71,7 @@
 
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a build-lib/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp -p build/lib/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 # javadoc
@@ -90,8 +90,8 @@
 %files
 %defattr(644,root,root,755)
 %doc licence-LGPL.txt README.txt ChangeLog.txt
-%{_javadir}/%{srcname}.jar
 %{_javadir}/%{srcname}-%{version}.jar
+%{_javadir}/%{srcname}.jar
 
 %if %{with javadoc}
 %files javadoc
@@ -106,6 +106,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/10/23 18:59:27  glen
+- update deps, builds now
+
 Revision 1.1  2011/10/22 13:32:38  glen
 - new, based on fedora package
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-flow-engine/java-flow-engine.spec?r1=1.1&r2=1.2&f=u