sync with f13 branch

gpm.init

@@ -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
 

gpm.spec

@@ -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/
@@ -21,7 +21,7 @@ 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
@@ -160,10 +160,17 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
-* Thu Nov 19 2009 Nikola Pajkovsky <npajkovs@redhat.com> 1.20.6.7
+* Thu Dec 10 2009 Nikola Pajkovsky <npajkovs@redhat.com> 1.20.6-9
+- add try-restart into gpm.init to be more LSB-compilant
+
+* Thu Nov 19 2009 Nikola Pajkovsky <npajkovs@redhat.com> 1.20.6-8
 - drop patch7
 - resolved #537724(does not work with capabilities)
 
+* Wed Sep 30 2009 Nikola Pajkovsky <npajkovs@redhat.com> 1.20.6-7
+- add BuildRequires: libcap-ng-devel
+- fix patch .capability
+
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl@redhat.com> 1.20.6-6
 - Don't complain if installing with --excludedocs (#515927)
 - Drop unnecessary capabilities in gpm (#517659)