[wicd] Make sure systemd unit files go to /usr/lib/systemd

[David Cantrell]

commit f0c195baf1e08011c76c616857ec2cc9a0488d7f
Author: David Cantrell <dcantrell at redhat.com>
Date:   Mon Mar 26 12:59:45 2012 -0400

    Make sure systemd unit files go to /usr/lib/systemd
    
    - Stop mangling logfile.py so bytecompiling will actually work
    - 91wicd -> 55wicd
    - Pick up new encryption template files in the %files list

 wicd.spec |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/wicd.spec b/wicd.spec
index be8fa22..9ec680b 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.1
-Release:             3%{?dist}
+Release:             4%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -117,6 +117,7 @@ rm -f po/ast.po
     --bin %{_bindir} \
     --pmutils %{_libdir}/pm-utils/sleep.d \
     --log %{_localstatedir}/log \
+    --systemd %{_systemd_unitdir} \
     --no-install-init
 %{__python} setup.py build
 %{__python} setup.py compile_translations
@@ -145,9 +146,6 @@ for lib in %{buildroot}%{python_sitelib}/wicd/*.py ; do
     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
 
@@ -211,7 +209,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/pm-utils/sleep.d/91wicd
+%{_libdir}/pm-utils/sleep.d/55wicd
 
 %files common -f %{name}.lang
 %defattr(-,root,root,-)
@@ -227,24 +225,31 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_sysconfdir}/wicd/scripts/predisconnect
 %{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh
 %{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh
+%{_sysconfdir}/logrotate.d/wicd.logrotate
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/wicd.conf
 %config(noreplace) %{_sysconfdir}/wicd/dhclient.conf.template.default
 %config(noreplace) %{_sysconfdir}/logrotate.d/wicd
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active
+%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active_wired
 %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/psu
 %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/wired_8021x
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk
+%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-peap
+%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-leap
+%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-peap
 %{_systemd_unitdir}/wicd.service
 %{python_sitelib}/wicd/*
-%{python_sitelib}/Wicd-%{version}*.egg-info
+%{python_sitelib}/wicd-%{version}*.egg-info
 %{_bindir}/wicd-cli
 %{_bindir}/wicd-client
 %{_sbindir}/wicd
@@ -292,6 +297,12 @@ 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-4
+- Make sure systemd unit files go to /usr/lib/systemd
+- Stop mangling logfile.py so bytecompiling will actually work
+- 91wicd -> 55wicd
+- Pick up new encryption template files in the %%files list
+
 * Thu Mar 22 2012 David Cantrell <dcantrell at redhat.com> - 1.7.1-3
 - BR babel
 - Remove po/ast.po because babel doesn't understand it