packages: java-hsqldb/java-hsqldb.spec - -server subpackage renamed to -n h...

[pawelz]

Author: pawelz                       Date: Sat Apr 24 16:45:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- -server subpackage renamed to -n hsqldb
- added Obsoletes tags
- rel 2

---- Files affected:
packages/java-hsqldb:
   java-hsqldb.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: packages/java-hsqldb/java-hsqldb.spec
diff -u packages/java-hsqldb/java-hsqldb.spec:1.32 packages/java-hsqldb/java-hsqldb.spec:1.33
--- packages/java-hsqldb/java-hsqldb.spec:1.32	Sat Apr 24 18:34:59 2010
+++ packages/java-hsqldb/java-hsqldb.spec	Sat Apr 24 18:45:26 2010
@@ -15,7 +15,7 @@
 Summary(pl.UTF-8):	Silnik relacyjnych baz danych SQL napisany w Javie
 Name:		java-hsqldb
 Version:	1.8.1.1
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		Libraries/Java
 Source0:	http://downloads.sourceforge.net/hsqldb/%{srcname}_%{ver}.zip
@@ -36,6 +36,7 @@
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	rpmbuild(macros) >= 1.556
 BuildRequires:	unzip
+Obsoletes:	hsqldb <= 1.8.1.1-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,6 +67,7 @@
 Summary:	Manual for HSQLDB
 Summary(pl.UTF-8):	Podręcznik do HSQLDB
 Group:		Documentation
+Obsoletes:	hsqldb-manual
 
 %description manual
 Documentation for HSQLDB.
@@ -78,6 +80,7 @@
 Summary(pl.UTF-8):	Dokumentacja javadoc do HSQLDB
 Group:		Documentation
 Requires:	jpackage-utils
+Obsoletes:	hsqldb-javadoc
 
 %description javadoc
 Javadoc for HSQLDB.
@@ -90,6 +93,7 @@
 Summary(pl.UTF-8):	Pliki demonstracyjne dla HSQLDB
 Group:		Development/Languages/Java
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	hsqldb-demo
 
 %description demo
 Demonstrations and samples for HSQLDB.
@@ -97,7 +101,7 @@
 %description demo -l pl.UTF-8
 Programy demonstracyjne i przykładowe dla HSQLDB.
 
-%package server
+%package -n hsqldb
 Summary:	HSQLDB server
 Summary(pl.UTF-8):	Serwer HSQLDB
 Group:		Applications/Databases
@@ -113,11 +117,12 @@
 Requires:	rc-scripts
 Provides:	group(hsqldb)
 Provides:	user(hsqldb)
+Obsoletes:	hsqldb-server <= 1.8.1.1-1
 
-%description server
+%description -n hsqldb
 HSQLDB server.
 
-%description server -l pl.UTF-8
+%description -n hsqldb -l pl.UTF-8
 Serwer HSQLDB.
 
 %prep
@@ -194,21 +199,21 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre server
+%pre -n hsqldb
 %groupadd -g 169 %{srcname}
 %useradd -u 169 -g %{srcname} -s /bin/sh -d %{_localstatedir}/lib/%{srcname} %{srcname}
 
-%post server
+%post -n hsqldb
 /sbin/chkconfig --add %{srcname}
 %service %{srcname} restart
 
-%preun server
+%preun -n hsqldb
 if [ "$1" = "0" ]; then
 	%service -q %{srcname} stop
 	/sbin/chkconfig --del %{srcname}
 fi
 
-%postun server
+%postun -n hsqldb
 if [ "$1" = "0" ]; then
 	%userremove %{srcname}
 	%groupremove %{srcname}
@@ -235,7 +240,7 @@
 %defattr(644,root,root,755)
 %{_datadir}/%{name}
 
-%files server
+%files -n hsqldb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/%{srcname}
@@ -253,6 +258,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2010/04/24 16:45:26  pawelz
+- -server subpackage renamed to -n hsqldb
+- added Obsoletes tags
+- rel 2
+
 Revision 1.32  2010/04/24 16:34:59  pawelz
 - renamed from hsqldb.spec
 
================================================================

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