From 105efb41881406bc77bdc5186f69c16f71dbf457 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 21 Jun 2010 02:35:15 +0000 Subject: [PATCH 1/4] Initialize branch F-13 for wicd --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From c7e7148b7e70bdd61dc8415d6e88bba13d1df098 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 21 Jun 2010 17:55:31 +0000 Subject: [PATCH 2/4] - Initial package --- .cvsignore | 1 + sources | 1 + wicd-1.7.0-initscript.patch | 12 ++ wicd-1.7.0-remove-WHEREAREMYFILES.patch | 53 +++++ wicd.logrotate | 6 + wicd.spec | 257 ++++++++++++++++++++++++ 6 files changed, 330 insertions(+) create mode 100644 wicd-1.7.0-initscript.patch create mode 100644 wicd-1.7.0-remove-WHEREAREMYFILES.patch create mode 100644 wicd.logrotate create mode 100644 wicd.spec diff --git a/.cvsignore b/.cvsignore index e69de29..fa44ba2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wicd-1.7.0.tar.bz2 diff --git a/sources b/sources index e69de29..c13af5a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +7e5956891d6696b6185baa7f5dc70c56 wicd-1.7.0.tar.bz2 diff --git a/wicd-1.7.0-initscript.patch b/wicd-1.7.0-initscript.patch new file mode 100644 index 0000000..5d85082 --- /dev/null +++ b/wicd-1.7.0-initscript.patch @@ -0,0 +1,12 @@ +diff -up wicd-1.7.0/in/init=redhat=wicd.in.orig wicd-1.7.0/in/init=redhat=wicd.in +--- wicd-1.7.0/in/init=redhat=wicd.in.orig 2010-01-14 18:49:11.000000000 -1000 ++++ wicd-1.7.0/in/init=redhat=wicd.in 2010-05-30 12:45:31.000000000 -1000 +@@ -43,7 +43,7 @@ force_stop() + killproc -p $pidfile wicd + RETVAL=$? + echo +- if [ $retval -eq 0 ]; then ++ if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile + fi diff --git a/wicd-1.7.0-remove-WHEREAREMYFILES.patch b/wicd-1.7.0-remove-WHEREAREMYFILES.patch new file mode 100644 index 0000000..cf08ae5 --- /dev/null +++ b/wicd-1.7.0-remove-WHEREAREMYFILES.patch @@ -0,0 +1,53 @@ +diff -up wicd-1.7.0/in/man=wicd-curses.8.in.orig wicd-1.7.0/in/man=wicd-curses.8.in +--- wicd-1.7.0/in/man=wicd-curses.8.in.orig 2010-01-14 18:49:11.000000000 -1000 ++++ wicd-1.7.0/in/man=wicd-curses.8.in 2010-05-19 09:20:00.000000000 -1000 +@@ -57,10 +57,6 @@ Bring up instructions on how to edit the + .BR O + Raise the Ad-Hoc network creation dialog + +-.SH "FILES" +-.TP +-.I ~/.wicd/WHEREAREMYFILES +-Reminder that your network configuration files are not here ;-) + .PP + .SH "SEE ALSO" + .BR wicd-client (1), +diff -up wicd-1.7.0/in/scripts=wicd-client.in.orig wicd-1.7.0/in/scripts=wicd-client.in +--- wicd-1.7.0/in/scripts=wicd-client.in.orig 2010-01-14 18:49:11.000000000 -1000 ++++ wicd-1.7.0/in/scripts=wicd-client.in 2010-05-19 09:20:25.000000000 -1000 +@@ -6,10 +6,6 @@ NC=$(tput sgr0) + if [ ! -d "$HOME/.wicd" ]; then + mkdir -p "$HOME/.wicd" + fi +-# Make sure the user knows WHEREAREMYFILES ;-) +-if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then +- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" +-fi + if [ "$DISPLAY" = "" ]; then + if [ -x "%BIN%wicd-curses" ]; then + if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then +diff -up wicd-1.7.0/in/scripts=wicd-curses.in.orig wicd-1.7.0/in/scripts=wicd-curses.in +--- wicd-1.7.0/in/scripts=wicd-curses.in.orig 2010-01-14 18:49:11.000000000 -1000 ++++ wicd-1.7.0/in/scripts=wicd-curses.in 2010-05-19 09:20:36.000000000 -1000 +@@ -2,8 +2,5 @@ + if [ ! -d "$HOME/.wicd" ]; then + mkdir -p "$HOME/.wicd" + fi +-if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then +- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" +-fi + + exec %PYTHON% -O %SHARE%curses/wicd-curses.py $@ +diff -up wicd-1.7.0/in/scripts=wicd-gtk.in.orig wicd-1.7.0/in/scripts=wicd-gtk.in +--- wicd-1.7.0/in/scripts=wicd-gtk.in.orig 2010-01-14 18:49:11.000000000 -1000 ++++ wicd-1.7.0/in/scripts=wicd-gtk.in 2010-05-19 09:20:44.000000000 -1000 +@@ -4,9 +4,5 @@ + if [ ! -d "$HOME/.wicd" ]; then + mkdir -p "$HOME/.wicd" + fi +-# Make sure the user knows WHEREAREMYFILES ;-) +-if [ -e "/var/lib/wicd/WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then +- ln -s "/var/lib/wicd/WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" +-fi + + exec %PYTHON% -O %SHARE%gtk/wicd-client.py $@ diff --git a/wicd.logrotate b/wicd.logrotate new file mode 100644 index 0000000..59ca51d --- /dev/null +++ b/wicd.logrotate @@ -0,0 +1,6 @@ +/var/log/wicd.log { + missingok + notifempty + size 30k + create 0600 root root +} diff --git a/wicd.spec b/wicd.spec new file mode 100644 index 0000000..38365d7 --- /dev/null +++ b/wicd.spec @@ -0,0 +1,257 @@ +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif + +%define debug_package %{nil} + +Name: wicd +Version: 1.7.0 +Release: 1%{?dist} +Summary: Wireless and wired network connection manager + +Group: System Environment/Base +License: GPLv2+ +URL: http://wicd.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source1: wicd.logrotate +Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch +Patch1: wicd-1.7.0-initscript.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) +BuildRequires: python2-devel +BuildRequires: desktop-file-utils + +Requires: pm-utils >= 1.2.4 +Requires: wicd-common = %{version}-%{release} + +%description +Wicd is designed to give the user as much control over behavior of network +connections as possible. Every network, both wired and wireless, has its +own profile with its own configuration options and connection behavior. +Wicd will try to automatically connect only to networks the user specifies +it should try, with a preference first to a wired network, then to wireless. + +This package provides the architecture-dependent components of wicd. + +%package common +Summary: Wicd common files +Group: System Environment/Base +BuildArch: noarch +Requires: dbus +Requires: dbus-python +Requires: dhclient +Requires: ethtool +Requires: iproute +Requires: logrotate +Requires: net-tools +Requires: wireless-tools +Requires: wpa_supplicant +Requires: %{name} = %{version}-%{release} +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires(postun): initscripts + +%description common +This package provides the main wicd daemon and the wicd-cli front-end. + +%package curses +Summary: Curses client for wicd +Group: Applications/System +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: python-urwid >= 0.9.8.3 + +%description curses +Client program for wicd that uses a curses interface. + +%package gtk +Summary: GTK+ client for wicd +Group: Applications/Internet +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: pygtk2-libglade >= 2.10 + +%description gtk +Client program for wicd that uses a GTK+ interface. + +%prep +%setup -q + +# Remove the WHEREAREMYFILES and resetting of ~/.wicd/WHEREAREMYFILES +# This is pointless. The documentation can just provide WHEREAREMYFILES, +# which we do in this package. +%patch0 -p1 + +# Init scripts should use $RETVAL, not $retval +# Reported upstream: https://bugs.launchpad.net/wicd/+bug/587690 +%patch1 -p1 + +%build +# NOTE: --etc is where dhclient.conf.template goes +%{__python} setup.py configure \ + --distro redhat \ + --lib %{_libdir} \ + --share %{_datadir}/wicd \ + --etc %{_sysconfdir}/dhcp \ + --bin %{_bindir} \ + --pmutils %{_libdir}/pm-utils/sleep.d \ + --log %{_localstatedir}/log +%{__python} setup.py build + +%install +rm -rf %{buildroot} +%{__python} setup.py install --skip-build --no-compile --root %{buildroot} +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-external.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-ioctl.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/cli/wicd-cli.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/curses_misc.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/netentry_curses.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/prefs_curses.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/daemon/wicd-daemon.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/gui.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/prefs.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/wicd-client.py + +rm -f %{buildroot}%{_localstatedir}/lib/wicd/WHEREAREMYFILES +rm -rf %{buildroot}%{_datadir}/doc +find %{buildroot} -type f -name ".empty_on_purpose" | xargs rm + +for lib in %{buildroot}%{python_sitelib}/wicd/*.py ; do + sed '/\/usr\/bin\/env/d' $lib > $lib.new && + touch -r $lib $lib.new && + mv $lib.new $lib +done + +sed -i -e 's/.$//' %{buildroot}%{python_sitelib}/wicd/logfile.py +sed -i -e '/^#!\//, 1d' %{buildroot}%{python_sitelib}/wicd/logfile.py + +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/wicd + +desktop-file-install \ + --remove-category="Application" \ + --delete-original \ + --dir=%{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/wicd.desktop + +desktop-file-install \ + --dir=%{buildroot}%{_sysconfdir}/xdg/autostart \ + %{buildroot}%{_sysconfdir}/xdg/autostart/wicd-tray.desktop + +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%post common +/sbin/chkconfig --add wicd + +%preun common +if [ $1 -eq 0 ]; then + /sbin/service wicd stop >/dev/null 2>&1 + /sbin/chkconfig --del wicd +fi + +%postun common +if [ $1 -ge 1 ]; then + /sbin/service wicd condrestart >/dev/null 2>&1 || : +fi + +%post gtk +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun gtk +if [ $1 -eq 0 ]; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans gtk +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + +%files +%defattr(-,root,root,-) +%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES +%{_libdir}/pm-utils/sleep.d/91wicd + +%files common -f %{name}.lang +%defattr(-,root,root,-) +%dir %{python_sitelib}/wicd +%dir %{_sysconfdir}/wicd +%dir %{_sysconfdir}/wicd/encryption +%dir %{_sysconfdir}/wicd/encryption/templates +%dir %{_sysconfdir}/wicd/scripts +%dir %{_sysconfdir}/wicd/scripts/postconnect +%dir %{_sysconfdir}/wicd/scripts/postdisconnect +%dir %{_sysconfdir}/wicd/scripts/preconnect +%dir %{_sysconfdir}/wicd/scripts/predisconnect +%{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh +%{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/wicd.conf +%config(noreplace) %{_sysconfdir}/dhcp/dhclient.conf.template.default +%config(noreplace) %{_sysconfdir}/logrotate.d/wicd +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap-tls +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/leap +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/peap +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/peap-tkip +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/ttls +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-hex +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-passphrase +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-shared +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk +%{_initddir}/wicd +%{python_sitelib}/wicd/* +%{python_sitelib}/Wicd-%{version}*.egg-info +%{_bindir}/wicd-cli +%{_bindir}/wicd-client +%{_sbindir}/wicd +%{_datadir}/applications/wicd.desktop +%{_datadir}/man/man1/wicd-client.1* +%{_datadir}/man/man5/wicd-manager-settings.conf.5* +%{_datadir}/man/man5/wicd-wired-settings.conf.5* +%{_datadir}/man/man5/wicd-wireless-settings.conf.5* +%{_datadir}/man/man8/wicd-cli.8* +%{_datadir}/man/man8/wicd.8* +%lang(nl) %{_datadir}/man/nl/man1/wicd-client.1* +%lang(nl) %{_datadir}/man/nl/man5/wicd-manager-settings.conf.5* +%lang(nl) %{_datadir}/man/nl/man5/wicd-wired-settings.conf.5* +%lang(nl) %{_datadir}/man/nl/man5/wicd-wireless-settings.conf.5* +%lang(nl) %{_datadir}/man/nl/man8/wicd.8* +%dir %{_datadir}/wicd +%dir %{_datadir}/wicd/backends +%dir %{_datadir}/wicd/cli +%dir %{_datadir}/wicd/daemon +%{_datadir}/wicd/backends/* +%{_datadir}/wicd/cli/* +%{_datadir}/wicd/daemon/* +%dir %{_localstatedir}/lib/wicd +%dir %{_localstatedir}/lib/wicd/configurations + +%files curses +%defattr(-,root,root,-) +%dir %{_datadir}/wicd/curses +%{_datadir}/wicd/curses/* +%{_bindir}/wicd-curses +%{_datadir}/man/man8/wicd-curses.8* +%lang(nl) %{_datadir}/man/nl/man8/wicd-curses.8* + +%files gtk +%defattr(-,root,root,-) +%dir %{_datadir}/wicd/gtk +%dir %{_datadir}/pixmaps/wicd +%{_sysconfdir}/xdg/autostart/wicd-tray.desktop +%{_datadir}/wicd/gtk/* +%{_datadir}/pixmaps/wicd/* +%{_datadir}/pixmaps/wicd-gtk.xpm +%{_bindir}/wicd-gtk +%{_datadir}/icons/hicolor/*/apps/wicd-gtk.png +%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg + +%changelog +* Mon Jun 21 2010 David Cantrell - 1.7.0-1 +- Initial package From 4f96c5d428dae5db230599909c46af16f0f66cb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:18:29 +0000 Subject: [PATCH 3/4] 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 2e5a18f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wicd -# $Id$ -NAME := wicd -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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 02f56a1c5388fac03b7657dd2cb1b8702f8a4818 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 25 Aug 2010 07:04:23 -1000 Subject: [PATCH 4/4] Remove hard dependency on the base package by wicd-common. Remove hard dependency on the base package by wicd-common. The base package is arch-specific and contains optional components for wicd. If it is present, wicd will make use of it, but it is not required for normal functionality. --- wicd.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wicd.spec b/wicd.spec index 38365d7..76682c9 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -23,7 +23,7 @@ BuildRequires: python2-devel BuildRequires: desktop-file-utils Requires: pm-utils >= 1.2.4 -Requires: wicd-common = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description Wicd is designed to give the user as much control over behavior of network @@ -47,7 +47,6 @@ Requires: logrotate Requires: net-tools Requires: wireless-tools Requires: wpa_supplicant -Requires: %{name} = %{version}-%{release} Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts @@ -60,7 +59,7 @@ This package provides the main wicd daemon and the wicd-cli front-end. Summary: Curses client for wicd Group: Applications/System BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} Requires: python-urwid >= 0.9.8.3 %description curses @@ -70,7 +69,7 @@ Client program for wicd that uses a curses interface. Summary: GTK+ client for wicd Group: Applications/Internet BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} Requires: pygtk2-libglade >= 2.10 %description gtk @@ -253,5 +252,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Wed Aug 25 2010 David Cantrell - 1.7.0-2 +- Remove hard dependency on the base package by wicd-common. The + base package is arch-specific and contains optional components + for wicd. If it is present, wicd will make use of it, but it is + not required for normal functionality. + * Mon Jun 21 2010 David Cantrell - 1.7.0-1 - Initial package