Author: pawelz Date: Mon Dec 29 12:01:03 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- user system jar libs
- unified %%install section
---- Files affected:
SPECS:
xmlgraphics-commons.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SPECS/xmlgraphics-commons.spec
diff -u SPECS/xmlgraphics-commons.spec:1.6 SPECS/xmlgraphics-commons.spec:1.7
--- SPECS/xmlgraphics-commons.spec:1.6 Mon Feb 12 23:09:23 2007
+++ SPECS/xmlgraphics-commons.spec Mon Dec 29 13:00:57 2008
@@ -13,8 +13,10 @@
BuildRequires: ant >= 1.5
BuildRequires: jpackage-utils
BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: java-commons-io
# disable internal-codecs in build.properities for compatibility with other
jre's
Requires: java-sun-jre
+BuildRequires: java-commons-io
BuildArch: noarch
ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,6 +40,9 @@
%prep
%setup -q -n %{name}
+rm lib/*.jar
+ln -s $(find-jar commons-io) lib
+
%build
export JAVAC=%{javac}
export JAVA=%{java}
@@ -48,9 +53,8 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-install build/*.jar $RPM_BUILD_ROOT%{_javadir}
-install lib/commons-io-1.1.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s commons-io-1.1.jar $RPM_BUILD_ROOT%{_javadir}/commons-io.jar
+install build/xmlgraphics-commons.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%clean
rm -rf $RPM_BUILD_ROOT
@@ -66,6 +70,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2008/12/29 12:00:57 pawelz
+- user system jar libs
+- unified %%install section
+
Revision 1.6 2007/02/12 22:09:23 glen
- tabs in preamble
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xmlgraphics-commons.spec?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
