Hello community, here is the log from the commit of package scmon for openSUSE:Factory checked in at 2012-07-13 11:34:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scmon (Old) and /work/SRC/openSUSE:Factory/.scmon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scmon", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scmon/scmon.changes 2012-03-23 12:10:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scmon.new/scmon.changes 2012-07-13 11:34:35.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 12 21:07:23 CEST 2012 - [email protected] + +- Update to version 0.4: + * Warning fix. +- Fix dbus policy. +- Fix init script header and packaging. + +------------------------------------------------------------------- Old: ---- scmon-0.3.tar.gz scmon-retval-fix.patch New: ---- scmon-0.4.tar.gz scmon-dbus-policy.patch scmon-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scmon.spec ++++++ --- /var/tmp/diff_new_pack.xD58gy/_old 2012-07-13 11:34:36.000000000 +0200 +++ /var/tmp/diff_new_pack.xD58gy/_new 2012-07-13 11:34:36.000000000 +0200 @@ -20,14 +20,17 @@ Summary: Makes waiting for smart card events easy License: GPL-2.0 Group: System/Daemons -Version: 0.3 +Version: 0.4 Release: 0 Url: http://code.google.com/p/loolixbodes/wiki/scmon Source0: http://scmon.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: scmon.diff Patch1: scmon-init.patch -Patch2: scmon-retval-fix.patch Patch3: scmon-glib231.patch +# PATCH-FIX-OPENSUSE scmon-dbus-policy.patch [email protected] -- Fix dbus policy warning. +Patch4: scmon-dbus-policy.patch +# PATCH-FIX-OPENSUSE scmon-includes.patch [email protected] -- Fix implicit declarations. +Patch5: scmon-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig %if 0%{?suse_version} <= 1010 @@ -67,8 +70,9 @@ %setup -q %patch0 %patch1 -%patch2 %patch3 -p1 +%patch4 +%patch5 -p1 %build %configure @@ -78,6 +82,7 @@ %makeinstall mkdir -p %{?buildroot:%{buildroot}}%{_sysconfdir}/init.d cp init/scmon.sle %{?buildroot:%{buildroot}}%{_sysconfdir}/init.d/scmon +ln -s %{_sysconfdir}/init.d/scmon %{?buildroot:%{buildroot}}%{_sbindir}/rcscmon %clean rm -rf $RPM_BUILD_ROOT @@ -85,7 +90,11 @@ %post %{fillup_and_insserv scmon} +%preun +%{stop_on_removal} + %postun +%{restart_on_update} %{insserv_cleanup} %files @@ -95,6 +104,7 @@ %{_sysconfdir}/init.d/scmon %{_datadir}/dbus-1/services/com.novell.Pkcs11Monitor.service %{_sbindir}/scmon +%{_sbindir}/rcscmon %{_bindir}/scmon-client %changelog ++++++ scmon-0.3.tar.gz -> scmon-0.4.tar.gz ++++++ ++++ 4487 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scmon-0.3/Makefile.am new/scmon-0.4/Makefile.am --- old/scmon-0.3/Makefile.am 2007-05-23 17:48:44.000000000 +0200 +++ new/scmon-0.4/Makefile.am 2008-01-30 05:40:35.000000000 +0100 @@ -63,6 +63,15 @@ include listener/Makefile.inc include monitor/Makefile.inc +rpm: dist-gzip + rpmbuild -tb $(distdir).tar.gz + +srpm: dist-gzip + rpmbuild -ts $(distdir).tar.gz + +rpms: dist-gzip + rpmbuild -ta $(distdir).tar.gz + update-makefiles: @for dir in $(include_subdirs) ; do \ echo " cp $(top_srcdir)/Makefile.am.subdir $(top_srcdir)/$$dir/Makefile.am" ; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scmon-0.3/configure.ac new/scmon-0.4/configure.ac --- old/scmon-0.3/configure.ac 2007-07-27 19:44:22.000000000 +0200 +++ new/scmon-0.4/configure.ac 2008-01-30 05:38:00.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([scmon], [0.3], [http://code.google.com/p/scmon/issues/list]) +AC_INIT([scmon], [0.4], [http://code.google.com/p/scmon/issues/list]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([monitor/scmon.c]) AC_CONFIG_HEADER([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scmon-0.3/monitor/sclog.c new/scmon-0.4/monitor/sclog.c --- old/scmon-0.3/monitor/sclog.c 2007-05-23 17:48:44.000000000 +0200 +++ new/scmon-0.4/monitor/sclog.c 2008-01-30 05:37:25.000000000 +0100 @@ -78,7 +78,7 @@ len = strlen (s); if (len == 0) { - return; + return TRUE; } written = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scmon-0.3/scmon.spec new/scmon-0.4/scmon.spec --- old/scmon-0.3/scmon.spec 2007-07-27 19:44:41.000000000 +0200 +++ new/scmon-0.4/scmon.spec 2008-01-30 05:38:40.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Makes waiting for smart card events easy Name: scmon -Version: 0.3 +Version: 0.4 Release: 1 License: GPL Group: System/Daemons ++++++ scmon-dbus-policy.patch ++++++ Index: monitor/com.novell.Pkcs11Monitor.conf =================================================================== --- monitor.orig/com.novell.Pkcs11Monitor.conf +++ monitor/com.novell.Pkcs11Monitor.conf @@ -4,17 +4,17 @@ <busconfig> <policy user="root"> <allow own="com.novell.Pkcs11Monitor"/> - <allow send_destination="com.novell.Pkcs11Monitor"/> - <allow send_interface="com.novell.Pkcs11Monitor"/> + <allow send_destination="com.novell.Pkcs11Monitor" + send_interface="com.novell.Pkcs11Monitor"/> </policy> <policy at_console="true"> - <allow send_destination="com.novell.Pkcs11Monitor"/> - <allow send_interface="com.novell.Pkcs11Monitor"/> + <allow send_destination="com.novell.Pkcs11Monitor" + send_interface="com.novell.Pkcs11Monitor"/> </policy> <policy context="default"> <deny own="com.novell.Pkcs11Monitor"/> - <deny send_destination="com.novell.Pkcs11Monitor"/> - <deny send_interface="com.novell.Pkcs11Monitor"/> + <deny send_destination="com.novell.Pkcs11Monitor" + send_interface="com.novell.Pkcs11Monitor"/> </policy> </busconfig> ++++++ scmon-includes.patch ++++++ Index: scmon-0.4/monitor/scinotify.c =================================================================== --- scmon-0.4.orig/monitor/scinotify.c +++ scmon-0.4/monitor/scinotify.c @@ -37,6 +37,9 @@ #include <fcntl.h> #include <glib.h> #include <errno.h> +#include <string.h> +#include <stdio.h> +#include <sys/socket.h> GQuark sc_inotify_error_quark (void) ++++++ scmon-init.patch ++++++ --- /var/tmp/diff_new_pack.xD58gy/_old 2012-07-13 11:34:37.000000000 +0200 +++ /var/tmp/diff_new_pack.xD58gy/_new 2012-07-13 11:34:37.000000000 +0200 @@ -1,12 +1,25 @@ ---- init/scmon.sle +Index: init/scmon.sle +=================================================================== +--- init/scmon.sle.orig +++ init/scmon.sle -@@ -6,8 +6,7 @@ +@@ -4,13 +4,13 @@ + # + # ### BEGIN INIT INFO - # Provides: scmon - # Required-Start: pcscd dbus +-# Provides: scmon +-# Required-Start: pcscd dbus -# X-UnitedLinux-Should-Start: pcscd dbus -# Required-Stop: -+# Required-Stop: pcscd dbus - # Default-Start: 2 3 5 - # Default-Stop: 0 1 6 - # Description: Smart Card Monitor +-# Default-Start: 2 3 5 +-# Default-Stop: 0 1 6 +-# Description: Smart Card Monitor ++# Provides: scmon ++# Required-Start: pcscd dbus $remote_fs ++# Required-Stop: pcscd dbus $remote_fs ++# Default-Start: 2 3 5 ++# Default-Stop: 0 1 6 ++# Short-Description: Smart Card Monitor ++# Description: Smart Card Monitor + ### END INIT INFO + + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
