Author: pawelz Date: Mon Apr 19 18:38:38 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use %undos macro
- BC: java-gcj-compat-devel
---- Files affected:
packages/JXplorer:
JXplorer.spec (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/JXplorer/JXplorer.spec
diff -u packages/JXplorer/JXplorer.spec:1.11
packages/JXplorer/JXplorer.spec:1.12
--- packages/JXplorer/JXplorer.spec:1.11 Sat Apr 17 09:44:26 2010
+++ packages/JXplorer/JXplorer.spec Mon Apr 19 20:38:33 2010
@@ -22,8 +22,9 @@
BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpmbuild(macros) >= 1.553
BuildRequires: sed >= 4.0
+BuildConflicts: java-gcj-compat-devel
Requires: java-help
Requires: jpackage-utils
Requires: jre-X11
@@ -46,7 +47,7 @@
%prep
%setup -q -b 1 -n jxplorer
-%{__sed} -i -e 's,\r$,,' build.xml
+%undos build.xml
icotool -x -o jxplorer.png jxplorer.ico
@@ -134,6 +135,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2010/04/19 18:38:33 pawelz
+- use %undos macro
+- BC: java-gcj-compat-devel
+
Revision 1.11 2010/04/17 07:44:26 jajcus
- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/JXplorer/JXplorer.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
