SPECS: hsqldb.spec - updated bcond desc - don't use non-existing e...

[qboosh]

Author: qboosh                       Date: Wed Dec 12 20:36:38 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated bcond desc
- don't use non-existing epoch
- no macro in Conflicts with old package
- pl for -server
- unified License format

---- Files affected:
SPECS:
   hsqldb.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/hsqldb.spec
diff -u SPECS/hsqldb.spec:1.18 SPECS/hsqldb.spec:1.19
--- SPECS/hsqldb.spec:1.18	Wed Dec 12 21:07:12 2007
+++ SPECS/hsqldb.spec	Wed Dec 12 21:36:33 2007
@@ -3,11 +3,11 @@
 # - make build with java 1.6
 #
 # Conditional build:
-%bcond_with	binary		# do not use binary jar, but compile (needs java < 1.6)
+%bcond_with	binary		# use binary jar instead of compiling (which needs java < 1.6)
 
 %define java_version %(IFS=.; set -- $(%java -fullversion 2>&1 | grep -o '".*"' | xargs); echo "$1.$2")
 %if "%{java_version}" >= "1.6"
-%define	with_binary 1
+%define	with_binary	1
 %endif
 
 %define		ver	%(echo %{version} | tr . _)
@@ -17,7 +17,7 @@
 Name:		hsqldb
 Version:	1.8.0.8
 Release:	2
-License:	BSD Style
+License:	BSD-like
 Group:		Development/Languages/Java
 Source0:	http://dl.sourceforge.net/hsqldb/%{name}_%{ver}.zip
 # Source0-md5:	f2539f9992430e20dfc1c31e712f29dd
@@ -92,7 +92,7 @@
 Summary:	Demo for HSQLDB
 Summary(pl.UTF-8):	Pliki demonstracyjne dla HSQLDB
 Group:		Development/Languages/Java
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description demo
 Demonstrations and samples for HSQLDB.
@@ -102,6 +102,7 @@
 
 %package server
 Summary:	HSQLDB server
+Summary(pl.UTF-8):	Serwer HSQLDB
 Group:		Applications/Databases
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -110,16 +111,19 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	rc-scripts
 Requires:	servlet >= 4
 Provides:	group(hsqldb)
 Provides:	user(hsqldb)
-Conflicts:	%{name} < 1.8.0.7-0.4
+Conflicts:	hsqldb < 1.8.0.7-0.4
 
 %description server
 HSQLDB server.
 
+%description server -l pl.UTF-8
+Serwer HSQLDB.
+
 %prep
 %setup -q -n %{name}
 %{__sed} -i -e 's,\r$,,' build/build.xml
@@ -255,6 +259,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2007-12-12 20:36:33  qboosh
+- updated bcond desc
+- don't use non-existing epoch
+- no macro in Conflicts with old package
+- pl for -server
+- unified License format
+
 Revision 1.18  2007-12-12 20:07:12  glen
 - unify java package
 - binary vs build is detected automatically
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/hsqldb.spec?r1=1.18&r2=1.19&f=u