rpms/gpm/F-13 gpm.init,1.19,1.20 gpm.spec,1.79,1.80

[Nikola Pajkovsky]

Author: npajkovs

Update of /cvs/extras/rpms/gpm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16790

Modified Files:
	gpm.init gpm.spec 
Log Message:
synchronize with f12 branch


Index: gpm.init
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-13/gpm.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gpm.init	6 Jan 2009 08:54:47 -0000	1.19
+++ gpm.init	12 Apr 2010 08:43:43 -0000	1.20
@@ -111,7 +111,7 @@ case "$1" in
   stop)
 	stop
 	;;
-  force-reload|reload)
+  force-reload|reload|try-restart)
 	echo "$0: Unimplemented feature."
 	RETVAL=3
 	;;
@@ -128,7 +128,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"
 	RETVAL=2
 esac
 


Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-13/gpm.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- gpm.spec	19 Nov 2009 13:34:50 -0000	1.79
+++ gpm.spec	12 Apr 2010 08:43:44 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.6
-Release: 7%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
@@ -15,13 +15,13 @@ Patch4: gpm-1.20.5-close-fds.patch
 Patch5: gpm-1.20.1-weak-wgetch.patch
 Patch6: gpm-1.20.6-libtool.patch
 #Patch7: gpm-1.20.6-capability.patch
-Requires(post): /sbin/chkconfig /sbin/install-info /sbin/ldconfig 
+Requires(post): /sbin/chkconfig /sbin/install-info /sbin/ldconfig
 Requires(preun): /sbin/chkconfig /sbin/install-info
 Requires(postun): /sbin/ldconfig
 # this defines the library version that this package builds.
 %define LIBVER 2.1.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: sed gawk texinfo bison ncurses-devel autoconf automake libtool
+BuildRequires: sed gawk texinfo bison ncurses-devel autoconf automake libtool libcap-ng-devel
 
 %description
 Gpm provides mouse support to text-based Linux applications like the
@@ -90,7 +90,7 @@ ln -sf libgpm.so.%{LIBVER} %{buildroot}/
 
 
 %ifnarch s390 s390x
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d  
 install -m 755 inputattach %{buildroot}%{_sbindir}
 install -m 644 conf/gpm-* %{buildroot}%{_sysconfdir}
 install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/gpm
@@ -160,10 +160,17 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
-* Thu Nov 19 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.20.6.7
+* Thu Dec 10 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.20.6-9
+- add try-restart into gpm.init to be more LSB-compilant
+
+* Thu Nov 19 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.20.6-8
 - drop patch7
 - resolved #537724(does not work with capabilities)
 
+* Wed Sep 30 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.20.6-7
+- add BuildRequires: libcap-ng-devel
+- fix patch .capability
+
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.20.6-6
 - Don't complain if installing with --excludedocs (#515927)
 - Drop unnecessary capabilities in gpm (#517659)