rpms/xtide/devel .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xtide.spec, 1.32, 1.33

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/devel

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
- 2.9.4
  (Relicensed: GPLv2+ -> GPLv3+)
- Update user creation script



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 May 2007 18:05:32 -0000	1.21
+++ .cvsignore	5 Sep 2007 11:08:52 -0000	1.22
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
 harmonics-dwf-20070318-dump-US.tar.bz2
-xtide-2.9.3.tar.bz2
+xtide-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 May 2007 18:05:32 -0000	1.21
+++ sources	5 Sep 2007 11:08:52 -0000	1.22
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
 7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
-0a3bd1bb4c6cfdc431876596b680b107  xtide-2.9.3.tar.bz2
+e87667669df1755579bca7085aef1580  xtide-2.9.4.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xtide.spec	21 Aug 2007 18:54:31 -0000	1.32
+++ xtide.spec	5 Sep 2007 11:08:52 -0000	1.33
@@ -3,8 +3,8 @@
 
 Summary:         Calculate tide all over the world
 Name:            xtide
-Version:         2.9.3
-Release:         3%{?dist}.2
+Version:         2.9.4
+Release:         1%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -18,7 +18,7 @@
 Source40:        Harminics-USpart-recreate-sh.tar.bz2
 Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
 
-License:         GPLv2+
+License:         GPLv3+
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,7 @@
 Requires:        xorg-x11-fonts-base
 Requires:        xtide-common
 
-Requires(pre):      %{_sbindir}/useradd
+Requires(pre):      shadow-utils
 Requires(preun):    /sbin/service
 Requires(preun):    /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -196,13 +196,18 @@
    /sbin/service xttpd condrestart &>/dev/null || :
 fi
 
-%pre 
-%{_sbindir}/useradd \
+%pre
+getent group xttpd &>/dev/null || \
+   %{_sbindir}/groupadd -r xttpd
+getent passwd xttpd &> /dev/null || \
+   %{_sbindir}/useradd \
    -c "XTide web server" \
+   -g xttpd \
    -d %{_sysconfdir}/%{name} \
    -r \
    -s /sbin/nologin \
-   xttpd 2>/dev/null || :
+   xttpd 2>/dev/null
+exit 0
 
 %preun
 if [ $1 = 0 ] ; then
@@ -245,6 +250,11 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
+- 2.9.4
+  (Relicensed: GPLv2+ -> GPLv3+)
+- Update user creation script
+
 * Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.2
 - Mass rebuild (buildID or binutils issue)