From 7196905cea63c3700221728f706a5c6373e93299 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 22 Nov 2007 19:56:31 +0000 Subject: [PATCH 1/5] Initialize branch F-8 for xfce4-modemlights-plugin --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 1561bf5b26d1c77f2770402b6a55840195ddc33e Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 10 Dec 2007 23:51:09 +0000 Subject: [PATCH 2/5] - Require ppp --- .cvsignore | 2 +- Makefile | 21 +++++ sources | 1 + ...modemlights-plugin-0.1.3.99-ifupdown.patch | 14 ++++ xfce4-modemlights-plugin.spec | 80 +++++++++++++++++++ 5 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 Makefile create mode 100644 sources create mode 100644 xfce4-modemlights-plugin-0.1.3.99-ifupdown.patch create mode 100644 xfce4-modemlights-plugin.spec diff --git a/.cvsignore b/.cvsignore index 9cd002d..4e00192 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-modemlights-plugin-0.1.1.tar.gz +xfce4-modemlights-plugin-0.1.3.99.tar.bz2 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..97a4d97 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: xfce4-places-plugin +# $Id$ +NAME := xfce4-modemlights-plugin +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/sources b/sources new file mode 100644 index 0000000..7c304a7 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +aeab49c57bdaeb12a73486515aae50cd xfce4-modemlights-plugin-0.1.3.99.tar.bz2 diff --git a/xfce4-modemlights-plugin-0.1.3.99-ifupdown.patch b/xfce4-modemlights-plugin-0.1.3.99-ifupdown.patch new file mode 100644 index 0000000..9c2aeb8 --- /dev/null +++ b/xfce4-modemlights-plugin-0.1.3.99-ifupdown.patch @@ -0,0 +1,14 @@ +--- xfce4-modemlights-plugin-0.1.3.99.orig/panel-plugin/panel-plugin.c 2007-11-08 09:28:58.000000000 +0100 ++++ xfce4-modemlights-plugin-0.1.3.99/panel-plugin/panel-plugin.c 2007-11-20 20:43:59.000000000 +0100 +@@ -355,9 +355,9 @@ + g_return_if_fail (rc); + + mwp->connection_cmd = +- g_strdup (xfce_rc_read_entry (rc, "connection_cmd", "/usr/bin/pon")); ++ g_strdup (xfce_rc_read_entry (rc, "connection_cmd", "/sbin/ifup")); + mwp->disconnection_cmd = +- g_strdup (xfce_rc_read_entry (rc, "disconnection_cmd", "/usr/bin/poff")); ++ g_strdup (xfce_rc_read_entry (rc, "disconnection_cmd", "/sbin/ifdown")); + mwp->device = + g_strdup (xfce_rc_read_entry (rc, "device", "ppp0")); + mwp->lockfile = diff --git a/xfce4-modemlights-plugin.spec b/xfce4-modemlights-plugin.spec new file mode 100644 index 0000000..7951cd7 --- /dev/null +++ b/xfce4-modemlights-plugin.spec @@ -0,0 +1,80 @@ +Name: xfce4-modemlights-plugin +Version: 0.1.3.99 +Release: 2%{?dist} +Summary: Modemlights for the Xfce panel + +Group: User Interface/Desktops +License: GPLv2 +URL: http://goodies.xfce.org/projects/panel-plugins/%{name} +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.1.3.99-ifupdown.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0, libxml2-devel +BuildRequires: gettext, perl(XML::Parser) +Requires: xfce4-panel >= 4.4.1, ppp + +%description +A Xfce4 panel applet intended to simplify establishing a ppp connection via +a modem. + +%prep +%setup -q +%patch0 -p1 -b .ifupdown + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog NEWS README +%{_libexecdir}/xfce4/panel-plugins/%{name} +%{_datadir}/xfce4/panel-plugins/*.desktop +%{_datadir}/pixmaps/modem-*.png + +%changelog +* Wed Nov 21 2007 Christoph Wickert - 0.1.3.99-2 +- Require ppp + +* Tue Nov 20 2007 Christoph Wickert - 0.1.3.99-1 +- Update to 0.1.4 RC +- Update license tag + +* Tue Apr 11 2006 Christoph Wickert - 0.1.1-7 +- Require xfce4-panel. + +* Thu Feb 16 2006 Christoph Wickert - 0.1.1-6 +- Rebuild for Fedora Extras 5. + +* Sat Jan 28 2006 Christoph Wickert - 0.1.1-5 +- Add libXt-devel BuildReqs. +- Drop libX11-devel. + +* Fri Dec 30 2005 Christoph Wickert - 0.1.1-4 +- Add libX11-devel BuildReqs for modular X. + +* Thu Dec 01 2005 Christoph Wickert - 0.1.1-3 +- Add libxfcegui4-devel BuildReqs. +- Fix %%defattr. + +* Mon Nov 14 2005 Christoph Wickert - 0.1.1-2 +- Initial Fedora Extras version. +- Rebuild for XFCE 4.2.3. +- disable-static instead of removing .a files. + +* Fri Sep 23 2005 Christoph Wickert - 0.1.1-1.fc4.cw +- Initial Fedora Extras version. +- Update to 0.1.1 +- Add libxml2 BuildReqs. + +* Sat Jul 30 2005 Christoph Wickert - 0.1.0-1.fc4.cw +- Initial RPM release. From 1b4cbf4529dd3ac457e89154b997aaa950912ef5 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Tue, 11 Dec 2007 00:05:13 +0000 Subject: [PATCH 3/5] small fix to the Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 97a4d97..6e6d8ca 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Makefile for source rpm: xfce4-places-plugin +# Makefile for source rpm: xfce4-modemlights-plugin # $Id$ NAME := xfce4-modemlights-plugin SPECFILE = $(firstword $(wildcard *.spec)) From 3b2e379f12596005a156902092af09a19200b149 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:31 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6e6d8ca..c77a21b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-modemlights-plugin 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d24e38c20da0491ad4e5fcc223fe774ea7ecb2a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:45:21 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c77a21b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-modemlights-plugin -# $Id$ -NAME := xfce4-modemlights-plugin -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 $$d/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/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8