packages: java-ical4j/java-ical4j.spec - don't force specific jdk - unified...

pawelz pawelz at pld-linux.org
Sun Apr 18 16:57:26 CEST 2010


Author: pawelz                       Date: Sun Apr 18 14:57:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk
- unified sf Source0

---- Files affected:
packages/java-ical4j:
   java-ical4j.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/java-ical4j/java-ical4j.spec
diff -u packages/java-ical4j/java-ical4j.spec:1.8 packages/java-ical4j/java-ical4j.spec:1.9
--- packages/java-ical4j/java-ical4j.spec:1.8	Mon Mar 30 02:49:47 2009
+++ packages/java-ical4j/java-ical4j.spec	Sun Apr 18 16:57:20 2010
@@ -1,10 +1,5 @@
 # $Revision$, $Date$
 %bcond_without  javadoc         # don't build javadoc
-%bcond_with	java_sun	# build with java-sun
-
-%if "%{pld_release}" == "ti"
-%define	with_java_sun	1
-%endif
 
 %define 	srcname	ical4j
 %define 	subver	rc1
@@ -17,15 +12,14 @@
 Release:	0.%{subver}.%{rel}
 License:	BSD-like
 Group:		Libraries/Java
-Source0:	http://dl.sourceforge.net/ical4j/%{srcname}-%{version}-%{subver}-src.tar.bz2
+Source0:	http://downloads.sourceforge.net/ical4j/%{srcname}-%{version}-%{subver}-src.tar.bz2
 # Source0-md5:	1d07fbdf05cfad34354603b25d2ef8ea
 URL:		http://ical4j.sourceforge.net/
 BuildRequires:	java-commons-codec
 BuildRequires:	java-commons-io
 BuildRequires:	java-commons-lang
 BuildRequires:	java-commons-logging
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -107,6 +101,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/04/18 14:57:20  pawelz
+- don't force specific jdk
+- unified sf Source0
+
 Revision 1.8  2009/03/30 00:49:47  glen
 - no, that was proper group
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-ical4j/java-ical4j.spec?r1=1.8&r2=1.9&f=u



More information about the pld-cvs-commit mailing list