Hello community, here is the log from the commit of package dnsmasq for openSUSE:Factory checked in at 2013-04-23 11:30:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old) and /work/SRC/openSUSE:Factory/.dnsmasq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq", Maintainer is "m...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes 2013-03-14 15:36:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2013-04-23 11:30:19.000000000 +0200 @@ -1,0 +2,21 @@ +Mon Apr 22 11:34:35 UTC 2013 - meiss...@suse.com + +- reintroduced /sbin/rcdnsmasq as /sbin/service link. + +------------------------------------------------------------------- +Sat Apr 20 05:54:35 UTC 2013 - crrodrig...@opensuse.org + +- Do not order after syslog.target which it is neither + required not recommended and currently no longer even exists. + +------------------------------------------------------------------- +Sat Apr 13 16:04:18 UTC 2013 - co...@suse.com + +- sync /srv/tftpboot directory attributes with atftp package + +------------------------------------------------------------------- +Wed Apr 3 23:09:10 UTC 2013 - crrodrig...@opensuse.org + +- remove all sysvinit support + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dnsmasq.spec ++++++ --- /var/tmp/diff_new_pack.roxsJC/_old 2013-04-23 11:30:21.000000000 +0200 +++ /var/tmp/diff_new_pack.roxsJC/_new 2013-04-23 11:30:21.000000000 +0200 @@ -23,7 +23,7 @@ Version: 2.65 Release: 0 Provides: dns_daemon -PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir +PreReq: /usr/sbin/useradd /bin/mkdir Url: http://www.thekelleys.org.uk/dnsmasq/ Source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz Source1: vendor-files.tar.bz2 @@ -31,20 +31,12 @@ Patch1: group_and_isc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel -BuildRequires: libidn BuildRequires: libidn-devel BuildRequires: pkg-config -BuildRequires: systemd BuildRequires: pkgconfig(libnetfilter_conntrack) - +BuildRequires: pkgconfig(systemd) %{?systemd_requires} -%if %suse_version > 1220 -%define _unitdir /usr/lib/systemd -%else -%define _unitdir /lib/systemd -%endif - %description Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP server. It is designed to provide DNS and, optionally, DHCP, to a small @@ -93,33 +85,27 @@ %service_add_pre %{name}.service %post -%{fillup_and_insserv dnsmasq} %service_add_post %{name}.service %preun -%stop_on_removal dnsmasq %service_del_preun %{name}.service %postun -%restart_on_update dnsmasq -%{insserv_cleanup} %service_del_postun %{name}.service %install make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk -install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -install -m 755 rc.dnsmasq-suse $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/dnsmasq -ln -sf ../../etc/init.d/dnsmasq $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf install -m 644 dnsmasq.reg $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/ install -m 644 SuSEFirewall.dnsmasq-dns ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/ install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf -install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/system/dnsmasq.service +install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot +ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq # utils subpackage mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 @@ -135,17 +121,16 @@ %defattr(-,root,root) %doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib README.SUSE dbus %config(noreplace) %{_sysconfdir}/dnsmasq.conf -%{_sysconfdir}/init.d/dnsmasq -%{_sbindir}/rcdnsmasq %{_sbindir}/dnsmasq +%{_sbindir}/rcdnsmasq %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp %dir %{_sysconfdir}/slp.reg.d/ %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg %{_mandir}/man8/dnsmasq.8.gz /etc/dbus-1/system.d/dnsmasq.conf -%{_unitdir}/system/dnsmasq.service -%dir %attr(0750,root,tftp) /srv/tftpboot +%{_unitdir}/dnsmasq.service +%dir %attr(0750,tftp,tftp) /srv/tftpboot %files utils %{_bindir}/dhcp_* ++++++ dnsmasq.service ++++++ --- /var/tmp/diff_new_pack.roxsJC/_old 2013-04-23 11:30:21.000000000 +0200 +++ /var/tmp/diff_new_pack.roxsJC/_new 2013-04-23 11:30:21.000000000 +0200 @@ -1,6 +1,6 @@ [Unit] Description=DNS caching server. -After=syslog.target network.target +After=network.target [Service] Type=dbus -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
