From 1460a64f481906d47f25caddc86e2d4610db7bb8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 3 Dec 2007 04:38:05 +0000 Subject: [PATCH 1/6] Update to 4.4.2 Remove unneeded patch --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-manager-4.4.1-wakeups.patch | 148 --------------------------- xfce-mcs-manager.spec | 12 ++- 4 files changed, 9 insertions(+), 155 deletions(-) delete mode 100644 xfce-mcs-manager-4.4.1-wakeups.patch diff --git a/.cvsignore b/.cvsignore index 7e5c9c6..03832f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-manager-4.4.1.tar.bz2 +xfce-mcs-manager-4.4.2.tar.bz2 diff --git a/sources b/sources index a149ce9..acbbe9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fd3613d5aa0a146226718a9ea2c0242 xfce-mcs-manager-4.4.1.tar.bz2 +876a4b5d582de8fdc01457df2e7e1339 xfce-mcs-manager-4.4.2.tar.bz2 diff --git a/xfce-mcs-manager-4.4.1-wakeups.patch b/xfce-mcs-manager-4.4.1-wakeups.patch deleted file mode 100644 index 3608a40..0000000 --- a/xfce-mcs-manager-4.4.1-wakeups.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- xfce-mcs-manager/xfce-mcs-manager/xfce-mcs-manager.c (revision 24722) -+++ xfce-mcs-manager/xfce-mcs-manager/xfce-mcs-manager.c (revision 25758) -@@ -79,14 +79,16 @@ - - static McsManager *manager; - --static enum -+enum - { - NOSIGNAL, - RESTART, - QUIT, - NUM_SIGNALS --} sigstate = NOSIGNAL; -+}; - -+static int signal_pipe[2] = { -1, -1 }; -+ - G_MODULE_EXPORT gchar * mcs_plugin_check_version (gint version) - { - if (XFCE_MCS_PLUGIN_VERSION == version) -@@ -311,6 +313,8 @@ - static void - sighandler (int signo) - { -+ guint32 sigstate; -+ - switch (signo) - { - case SIGUSR1: -@@ -319,28 +323,46 @@ - - default: - sigstate = QUIT; -+ break; - } -+ -+ write (signal_pipe[1], &sigstate, sizeof (sigstate)); - } - - static gboolean --check_signal_state (void) -+signal_pipe_io (GIOChannel *source, -+ GIOCondition condition, -+ gpointer data) - { -- if (sigstate == RESTART) -+ guint32 sigstate = 0; -+ gsize bread = 0; -+ -+ if (G_IO_ERROR_NONE == g_io_channel_read (source, (gchar *)&sigstate, -+ sizeof (sigstate), &bread) -+ && sizeof (sigstate) == bread) - { -- /* unload all plugins and destroy the manager */ -- unload_plugins (); -- mcs_manager_destroy (manager); -+ switch (sigstate) -+ { -+ case RESTART: -+ /* unload all plugins and destroy the manager */ -+ unload_plugins (); -+ mcs_manager_destroy (manager); - -- /* just run the MCS manager from scratch */ -- execvp (rargv[0], rargv); -- _exit (EXIT_SUCCESS); -+ /* just run the MCS manager from scratch */ -+ execvp (rargv[0], rargv); -+ _exit (EXIT_SUCCESS); -+ break; -+ -+ case QUIT: -+ gtk_main_quit (); -+ break; -+ -+ default: -+ break; -+ } -+ - } -- else if (sigstate == QUIT) -- { -- gtk_main_quit (); -- return FALSE; -- } -- -+ - return TRUE; - } - -@@ -354,6 +376,8 @@ - gboolean daemon_mode; - gboolean std_mgr; - int i; -+ GIOChannel *signal_io; -+ guint signal_watch = 0; - - /* save argv for restart */ - rargv = g_strdupv (argv); -@@ -400,6 +424,29 @@ - - plugin_load_all (); - gdk_flush (); -+ -+ if (pipe (signal_pipe)) -+ g_warning ("Unable to create signal-watch pipe: %s. Signals will be ignored.", strerror(errno)); -+ else -+ { -+ /* set writing end to non-blocking */ -+ int oldflags = fcntl (signal_pipe[1], F_GETFL); -+ if(fcntl (signal_pipe[1], F_SETFL, oldflags | O_NONBLOCK)) -+ { -+ g_warning ("Unable to set signal-watch pipe to non-blocking mode: %s. Signals will be ignored.", strerror(errno)); -+ close (signal_pipe[0]); -+ close (signal_pipe[1]); -+ } -+ else -+ { -+ signal_io = g_io_channel_unix_new (signal_pipe[0]); -+ g_io_channel_set_encoding (signal_io, NULL, NULL); -+ g_io_channel_set_close_on_unref (signal_io, FALSE); -+ signal_watch = g_io_add_watch (signal_io, G_IO_IN | G_IO_PRI, -+ signal_pipe_io, NULL); -+ g_io_channel_unref (signal_io); -+ } -+ } - - #ifdef HAVE_SIGACTION - act.sa_handler = sighandler; -@@ -453,11 +500,14 @@ - else - g_message ("Daemon mode disabled (for debug purpose only!)"); - -- /* Establish signal-check timer */ -- g_timeout_add (500, (GSourceFunc) check_signal_state, NULL); -- - gtk_main (); - -+ if (signal_watch) { -+ g_source_remove (signal_watch); -+ close (signal_pipe[0]); -+ close (signal_pipe[1]); -+ } -+ - unload_plugins (); - - mcs_manager_destroy (manager); diff --git a/xfce-mcs-manager.spec b/xfce-mcs-manager.spec index da0df21..5abbe3a 100644 --- a/xfce-mcs-manager.spec +++ b/xfce-mcs-manager.spec @@ -1,11 +1,10 @@ Summary: Multi channel settings manager Name: xfce-mcs-manager -Version: 4.4.1 -Release: 3%{?dist} +Version: 4.4.2 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-manager-4.4.1.tar.bz2 -Patch0: xfce-mcs-manager-4.4.1-wakeups.patch +Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libxfce4mcs >= %{version} @@ -32,7 +31,6 @@ mcs plugins. %prep %setup -q -%patch0 -p1 -b .wakeups %build %configure @@ -70,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/xfce4/xfce-mcs-manager %changelog +* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 +- Update to 4.4.2 +- Remove unneeded patch + * Sun Aug 26 2007 Kevin Fenzi - 4.4.1-3 - Update License tag From ad21fbafb54a0af7ceea45972c6834d30c92b701 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 10 Feb 2008 20:42:44 +0000 Subject: [PATCH 2/6] Rebuild for gcc43 --- xfce-mcs-manager.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce-mcs-manager.spec b/xfce-mcs-manager.spec index 5abbe3a..6e654be 100644 --- a/xfce-mcs-manager.spec +++ b/xfce-mcs-manager.spec @@ -1,7 +1,7 @@ Summary: Multi channel settings manager Name: xfce-mcs-manager Version: 4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2 @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/xfce4/xfce-mcs-manager %changelog +* Sun Feb 10 2008 Kevin Fenzi - 4.4.2-2 +- Rebuild for gcc43 + * Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 - Update to 4.4.2 - Remove unneeded patch From 141161f2d8224f048402f5a7beb1db7f3d9d0787 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 27 Oct 2008 14:29:38 +0000 Subject: [PATCH 3/6] - Update to 4.4.3 --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-manager.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 03832f0..c6669bd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-manager-4.4.2.tar.bz2 +xfce-mcs-manager-4.4.3.tar.bz2 diff --git a/sources b/sources index acbbe9c..0289c65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -876a4b5d582de8fdc01457df2e7e1339 xfce-mcs-manager-4.4.2.tar.bz2 +452815eb75d8a1ec70c1abbc78bc6d4e xfce-mcs-manager-4.4.3.tar.bz2 diff --git a/xfce-mcs-manager.spec b/xfce-mcs-manager.spec index 6e654be..16bd64d 100644 --- a/xfce-mcs-manager.spec +++ b/xfce-mcs-manager.spec @@ -1,10 +1,10 @@ Summary: Multi channel settings manager Name: xfce-mcs-manager -Version: 4.4.2 -Release: 2%{?dist} +Version: 4.4.3 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-mcs-manager-%{version}.tar.bz2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libxfce4mcs >= %{version} @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/xfce4/xfce-mcs-manager %changelog +* Mon Oct 27 2008 Christoph Wickert - 4.4.3-1 +- Update to 4.4.3 + * Sun Feb 10 2008 Kevin Fenzi - 4.4.2-2 - Rebuild for gcc43 From 421de01971080f821b4ade89b16e3d0d11e6cb61 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 27 Oct 2008 16:08:36 +0000 Subject: [PATCH 4/6] BR intltool --- xfce-mcs-manager.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xfce-mcs-manager.spec b/xfce-mcs-manager.spec index 16bd64d..ed80d7b 100644 --- a/xfce-mcs-manager.spec +++ b/xfce-mcs-manager.spec @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libxfce4mcs >= %{version} Requires: libxfcegui4 >= %{version} BuildRequires: pkgconfig -BuildRequires: gettext +BuildRequires: gettext intltool BuildRequires: libxfce4mcs-devel >= %{version} BuildRequires: libxfcegui4-devel >= %{version} @@ -70,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Oct 27 2008 Christoph Wickert - 4.4.3-1 - Update to 4.4.3 +- BuildRequire intltool * Sun Feb 10 2008 Kevin Fenzi - 4.4.2-2 - Rebuild for gcc43 From e897f1df05eb30a750efa801669334deed9dc68e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 10 Feb 2009 00:50:43 +0000 Subject: [PATCH 5/6] This package is no longer used with the inclusion of the xfconf framework. --- Makefile | 21 ----- dead.package | 1 + sources | 1 - xfce-mcs-manager.spec | 179 ------------------------------------------ 4 files changed, 1 insertion(+), 201 deletions(-) delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xfce-mcs-manager.spec diff --git a/Makefile b/Makefile deleted file mode 100644 index 089b02c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce-mcs-manager -# $Id$ -NAME := xfce-mcs-manager -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..fea988f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package is no longer used with the inclusion of the xfconf framework. diff --git a/sources b/sources deleted file mode 100644 index 0289c65..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -452815eb75d8a1ec70c1abbc78bc6d4e xfce-mcs-manager-4.4.3.tar.bz2 diff --git a/xfce-mcs-manager.spec b/xfce-mcs-manager.spec deleted file mode 100644 index ed80d7b..0000000 --- a/xfce-mcs-manager.spec +++ /dev/null @@ -1,179 +0,0 @@ -Summary: Multi channel settings manager -Name: xfce-mcs-manager -Version: 4.4.3 -Release: 1%{?dist} -License: LGPLv2+ -URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-mcs-manager-%{version}.tar.bz2 -Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: libxfce4mcs >= %{version} -Requires: libxfcegui4 >= %{version} -BuildRequires: pkgconfig -BuildRequires: gettext intltool -BuildRequires: libxfce4mcs-devel >= %{version} -BuildRequires: libxfcegui4-devel >= %{version} - -%description -This package includes a multi channel settings manager for Xfce4. - -%package devel -Summary: Header file to build xfce-mcs-manager plugins -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libxfce4mcs-devel -Requires: libxfcegui4-devel -Requires: gtk2-devel - -%description devel -This package includes the header files you will need to build -mcs plugins. - -%prep -%setup -q - -%build -%configure -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/xfce4 -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4 -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4/doc - -%find_lang %{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc ChangeLog COPYING AUTHORS -%docdir %{_datadir}/xfce4/doc -%{_datadir}/xfce4/doc/C -%{_datadir}/xfce4/doc/fr -%{_datadir}/xfce4/doc/it -%{_datadir}/icons/*/*/apps/*.png -%{_bindir}/* -%{_datadir}/applications/* -%dir %{_libdir}/xfce4 -%dir %{_datadir}/xfce4 -%dir %{_datadir}/xfce4/doc - -%files devel -%defattr(-, root, root,-) -%{_libdir}/pkgconfig/*.pc -%{_includedir}/xfce4/xfce-mcs-manager - -%changelog -* Mon Oct 27 2008 Christoph Wickert - 4.4.3-1 -- Update to 4.4.3 -- BuildRequire intltool - -* Sun Feb 10 2008 Kevin Fenzi - 4.4.2-2 -- Rebuild for gcc43 - -* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 -- Update to 4.4.2 -- Remove unneeded patch - -* Sun Aug 26 2007 Kevin Fenzi - 4.4.1-3 -- Update License tag - -* Wed Aug 01 2007 Kevin Fenzi - 4.4.1-2 -- Add patch to fix excessive wakeups (fixes #250364) - -* Sun Apr 15 2007 Kevin Fenzi - 4.4.1-1 -- Update to 4.4.1 -- Own some unowned directories - -* Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 -- Update to 4.4.0 - -* Thu Nov 9 2006 Kevin Fenzi - 4.3.99.2-2 -- Add libxfcegui4-devel to requires on devel subpackage - -* Thu Nov 9 2006 Kevin Fenzi - 4.3.99.2-1 -- Update to 4.3.99.2 - -* Thu Oct 5 2006 Kevin Fenzi - 4.3.99.1-3 -- Add period to description -- Fix defattr - -* Wed Oct 4 2006 Kevin Fenzi - 4.3.99.1-2 -- Bump release for devel checkin - -* Sun Sep 3 2006 Kevin Fenzi - 4.3.99.1-1 -- Update to 4.3.99.1 - -* Tue Jul 11 2006 Kevin Fenzi - 4.3.90.2-1 -- Update to 4.3.90.2 - -* Thu Apr 27 2006 Kevin Fenzi - 4.3.90.1.fc6 -- Upgrade to 4.3.90.1 - -* Thu Feb 16 2006 Kevin Fenzi - 4.2.3-2.fc5 -- Rebuild for fc5 - -* Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 -- Update to 4.2.3 -- Added dist tag -- Added doc/he files - -* Tue May 17 2005 Kevin Fenzi - 4.2.2-1.fc4 -- Update to 4.2.2 -- Added doc/fr subdirectory - -* Fri Mar 25 2005 Kevin Fenzi - 4.2.1-3.fc4 -- lowercase Release - -* Sat Mar 19 2005 Warren Togami - 4.2.1-2 -- remove stuff - -* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 -- Updated to 4.2.1 version - -* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-3 -- Fixed case of Xfce - -* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 -- Capitalized first letter of Summary in devel section to quiet rpmlint - -* Sun Jan 23 2005 Than Ngo 4.2.0-1 -- update to 4.2.0 - -* Wed Dec 08 2004 Than Ngo 4.1.99.1-1 -- update to 4.2 rc1 - -* Wed Sep 01 2004 Than Ngo 4.0.6-2 -- use find_lang macro - -* Mon Jul 19 2004 Than Ngo 4.0.6-1 -- update to 4.0.6 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Thu Apr 15 2004 Than Ngo 4.0.5-1 -- update to 4.0.5 - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Tue Jan 27 2004 Than Ngo 4.0.3-2 -- fixed dependant libraries check on x86_64 - -* Fri Jan 09 2004 Than Ngo 4.0.3-1 -- 4.0.3 release - -* Thu Dec 25 2003 Than Ngo 4.0.2-1 -- 4.0.2 release - -* Tue Dec 16 2003 Than Ngo 4.0.1-1 -- initial build - From a2b984c44089aaa84dccd675b8e6c15fa4319ec8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:42:15 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore