diff --git a/.gitignore b/.gitignore index 9f5ca63..c11ccbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -dhcp-forwarder-0.8.tar.bz2 -dhcp-forwarder-0.8.tar.bz2.asc -/dhcp-forwarder-0.9.tar.xz -/dhcp-forwarder-0.9.tar.xz.asc +/dhcp-forwarder-0.10.tar.xz +/dhcp-forwarder-0.10.tar.xz.asc diff --git a/dhcp-forwarder.spec b/dhcp-forwarder.spec index 3981014..122bad0 100644 --- a/dhcp-forwarder.spec +++ b/dhcp-forwarder.spec @@ -27,8 +27,8 @@ Summary: DHCP relay agent Name: dhcp-forwarder -Version: 0.9 -Release: %release_func 1502 +Version: 0.10 +Release: %release_func 1800 License: GPLv3 Group: System Environment/Daemons URL: http://www.nongnu.org/dhcp-fwd/ @@ -82,7 +82,6 @@ Requires(postun): minit-setup Summary: Systemd initscripts for %name Group: System Environment/Daemons Provides: init(%name) = systemd -Source20: %name.systemd.service Requires(post): /bin/systemctl Requires(preun): /bin/systemctl Requires(postun): /bin/systemctl @@ -148,6 +147,7 @@ with the systemd initconcept. %configure \ --enable-release \ --with-initrddir=%_initrddir \ + --with-systemd-unitdir=%_unitdir \ %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc make %{?_smp_mflags} @@ -158,7 +158,6 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install install-contrib install -d -m 0700 $RPM_BUILD_ROOT%homedir $RPM_BUILD_ROOT%_var/run install -D -p -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/dhcp-forwarder.conf -install -D -p -m 0644 %SOURCE20 $RPM_BUILD_ROOT%_unitdir/%name.service touch $RPM_BUILD_ROOT%_var/run/dhcp-fwd.pid @@ -264,6 +263,10 @@ test "$1" -eq 1 || /bin/systemctl try-restart %name.service >/dev/null 2>&1 || : %changelog +* Mon Apr 30 2012 Enrico Scholz - 0.10-1800 +- updated to 0.10; fixed build in recent environemnts (#817292) +- removed local systemd unit; it is shipped upstream + * Fri Jan 13 2012 Fedora Release Engineering - 0.9-1502 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/dhcp-forwarder.systemd.service b/dhcp-forwarder.systemd.service deleted file mode 100644 index a2f174c..0000000 --- a/dhcp-forwarder.systemd.service +++ /dev/null @@ -1,12 +0,0 @@ -# --*- conf -*-- -[Unit] -Description = Agent to relay DHCP messages between two networks -After = syslog.target - -[Service] -Type = simple -ExecStart = /usr/sbin/dhcp-fwd -n -c /etc/dhcp-fwd.conf -Restart = on-failure - -[Install] -WantedBy = multi-user.target diff --git a/lastver b/lastver index b63ba69..68c123c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.9 +0.10 diff --git a/sources b/sources index e8e91f5..f29f0fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5864cf1a0835eb0b125a184c8498b8a0 dhcp-forwarder-0.9.tar.xz -ca7f6d6e92a6a089b846089d71a7bfe9 dhcp-forwarder-0.9.tar.xz.asc +3b96dd27f6d05502d4048acab453808d dhcp-forwarder-0.10.tar.xz +2477a9d80813ad5b55fe28756d34d85c dhcp-forwarder-0.10.tar.xz.asc