[wicd] Remove our wicd.service file, this is provided by upstream now

David Cantrell dcantrel at fedoraproject.org
Mon Mar 26 17:52:47 UTC 2012


commit 29a13776ba27fb8de7efd63fc3e492056f359e0f
Author: David Cantrell <dcantrell at redhat.com>
Date:   Mon Mar 26 13:52:33 2012 -0400

    Remove our wicd.service file, this is provided by upstream now

 wicd.service |   15 ---------------
 wicd.spec    |   13 ++++++-------
 2 files changed, 6 insertions(+), 22 deletions(-)
---
diff --git a/wicd.spec b/wicd.spec
index 9ec680b..e36d92e 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.1
-Release:             4%{?dist}
+Release:             5%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -17,8 +17,7 @@ License:             GPLv2+
 URL:                 http://wicd.sourceforge.net/
 Source0:             http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:             wicd.logrotate
-Source2:             wicd.service
-Source3:             org.wicd.daemon.service
+Source2:             org.wicd.daemon.service
 
 Patch0:              wicd-1.7.0-remove-WHEREAREMYFILES.patch
 Patch1:              wicd-1.7.1-dbus-failure.patch
@@ -149,11 +148,8 @@ done
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/wicd
 
-mkdir -p %{buildroot}%{_systemd_unitdir}
-install -m 0644 %{SOURCE2} %{buildroot}%{_systemd_unitdir}/wicd.service
-
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
-install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
+install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
 
 desktop-file-install \
     --remove-category="Application" \
@@ -297,6 +293,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Mon Mar 26 2012 David Cantrell <dcantrell at redhat.com> - 1.7.1-5
+- Remove our wicd.service file, this is provided by upstream now
+
 * Mon Mar 26 2012 David Cantrell <dcantrell at redhat.com> - 1.7.1-4
 - Make sure systemd unit files go to /usr/lib/systemd
 - Stop mangling logfile.py so bytecompiling will actually work


More information about the scm-commits mailing list