Accepting request 366204 from home:pluskalm:branches:network

OBS-URL: https://build.opensuse.org/request/show/366204
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=79

dnsmasq-2.75.tar.xz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlW6gmQACgkQKPyGmiibgrdp4wCfeQXAMoPPcKGYpGPWZIlKXDCZ
+JhEAnRQ2EgSlpQgYwSn6HDPVnG4UY5dQ
+=VQqP
+-----END PGP SIGNATURE-----

dnsmasq.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb  2 21:34:39 UTC 2016 - mpluskal@suse.com
+
+- Add gpg signature
+
 -------------------------------------------------------------------
 Mon Aug 24 18:10:01 UTC 2015 - stefan.bruens@rwth-aachen.de
 

dnsmasq.keyring

@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQGiBEdAp6gRBACnOax2ntWEcx7Fw4OMXOJrGmfFcHUVkoe+hpRaFlfENvhffPdM
+8qELIlc6xvQRUfnHViIYYTYNbKd4+8QRQMP9lZwKP0ckDA7/2WW7oig/6MNGGYu+
+VmngF+l0KU5gyib8NYeyiBjdJOcBrx3+q9S0U+BhyxmrvHgxJub4n/sJiwCgq/oH
+n2b7cKdqzuK1+B5TaRKExk8D/RoZYGRDvSJpMzJyyED77CAH946I+oVbNLyYMMy/
+LxaA/x0nBQ9Mu0bAVvUHF+lG++kKNAd7vcveGPKCoXVuPOx/LtdOgMma/ipEGHWt
+mzgHRoNIYweffwMhEP929woWJ2KXrH0P0imel7aOLHYl7w6hybdaQ9tBExMlMj6r
+1+4DA/9LduhBW1MWxttDUhex0iXQPx6vFwqai+yjtueyhC3Y5ZGe8JBdWLXzoD3v
+IMfCeLk0RKoy0EP2JhgUwYxvg80KPDLHfEcZWk2BR/LXyHPyf2x7N1YVJewYkCSN
+VTUgiH6HfxGdH3ucP9vEMiP/0p0umN4MMZiKzMYylVpPTNfzlLQwU2ltb24gS2Vs
+bGV5IChuZXcga2V5KSA8c2ltb25AdGhla2VsbGV5cy5vcmcudWs+iEYEEBECAAYF
+AkdBboEACgkQKeFPmTkbOShRlgCfSh1u9jLW4tp33rfSlkO3xzkPj24AnieFVZk8
+kPTTqz7J/0T0Dot9H3SGiEYEExECAAYFAkdMI68ACgkQFuL09fyB4VlLuQCdGHJe
+uokNUce+dy0pNF2R8mejemsAnRCmxKnl8/7FRCY0mfF3Pk+mnbX4iGAEExECACAF
+AkdAp6gCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAo/IaaKJuCtwePAJkB
+pdX+q/VLx1PEM6ux9tGPXIeqcACfb0ZC5bOrQK6z4VstM70q+fajiNC5Ag0ER0Cn
+uBAIAMo6EdGScaI0qDzDuvmrTr4VbGxf4LOGE7s/LGZKLP0M0I1W5WXEIUcU5u3j
+sGuKDZ+YP5eNFg5V48GvVCOSDq16senlyaFNfwZ8CqWJGE2wz1PiFzGR08hALsfH
+11i6efntcISuSgjQpFkL6AA3I4yANskTK40ZfSyha0WKCI/8nfQ3OVbgUjb63jFG
+ckuidHEZiWIdl8K0DifDFGF2uQmOZ9tsTidpBOf1mZoq4Uy8sRDehdqu14TB1nOh
+ERFrJhVA43OWlklCuIGrh2qOQENYKemZapdE37EiPd7MT3E3fGWO7dlXk5Kqk97S
+Va89u4h5cqxMW63CaIMFn8T/5mMAAwYIAIPQHFbZ2d1RfiBTKrEJ2LNWa978kihF
+y6nQoyajZ92i/9uYQwLdrhJahrO2AONJ1fqoL5asS0nprE1TqOHPJBfKCxUKMHzI
+MM+uRwbxENafQIlPL1E5qzsWwcJZx2JdWLLL7kVnIrIRzH6nL/qdr9fbDBBJR1NS
+KgfCrT+qy7+VVrA+QcoXEFiuBz/MlmbtZHNrHy+6p3HcvDev98AWdoLobhkUfQN/
+/5ujk2iwnmFCsBcqwrbpaq8TJHThur+COTZ2C9AXCRJfDvgEUKAGHaqXvq8grshT
+ibk64wttvZtQQ+8w/X01LPWBcTBK1RJS+ZkiCtTH7/ppYTmXSY17eDuISQQYEQIA
+CQUCR0CnuAIbDAAKCRAo/IaaKJuCt7CJAJ4oh5z19BNnN12v7QIkxXyVU0jt5wCd
+G9/hEd8WOkbOb2yQ2rny/XBVtCs=
+=7kAN
+-----END PGP PUBLIC KEY BLOCK-----

dnsmasq.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,15 @@ Release:        0
 Provides:       dns_daemon
 PreReq:         /usr/sbin/useradd /bin/mkdir
 Url:            http://www.thekelleys.org.uk/dnsmasq/
-Source:         http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
+Source0:        http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
-Source1:        dnsmasq.reg
+Source1:        http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz.asc
-Source2:        dnsmasq.service
+Source2:        %{name}.keyring
-Source3:        rc.dnsmasq-suse
+Source3:        dnsmasq.reg
-Source4:        SuSEFirewall.dnsmasq-dhcp
+Source4:        dnsmasq.service
-Source5:        SuSEFirewall.dnsmasq-dns
+Source5:        rc.dnsmasq-suse
-Source6:        %{name}-rpmlintrc
+Source6:        SuSEFirewall.dnsmasq-dhcp
+Source7:        SuSEFirewall.dnsmasq-dns
+Source8:        %{name}-rpmlintrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
@@ -63,7 +65,7 @@ Utilities that use the standard DHCP protocol to query/remove a DHCP
 server's leases.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 # Some docs have the DOS line ends
 dos2unix contrib/systemd/dbus_activation
@@ -125,12 +127,12 @@ make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk COPTS=%{_copts}
 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 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf
-install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
+install -m 644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
-install -m 644 %SOURCE5 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
+install -m 644 %SOURCE7 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
+install -m 644 %SOURCE6 ${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}/dnsmasq.service
+install -D -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
 ln -sf %{_sbindir}/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/dnsmasq.d