Hello community, here is the log from the commit of package dnsmasq for openSUSE:Factory checked in at 2015-08-27 08:54:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old) and /work/SRC/openSUSE:Factory/.dnsmasq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq" Changes: -------- --- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes 2015-08-19 13:41:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2015-08-27 08:54:15.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 24 18:10:01 UTC 2015 - [email protected] + +- spec file cleanup, get rid of redifinition warnings + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dnsmasq.spec ++++++ --- /var/tmp/diff_new_pack.I3lC1d/_old 2015-08-27 08:54:15.000000000 +0200 +++ /var/tmp/diff_new_pack.I3lC1d/_new 2015-08-27 08:54:15.000000000 +0200 @@ -88,14 +88,13 @@ dnsmasq.conf.example %build -echo "#define HAVE_DBUS" >> src/config.h -echo "#define HAVE_CONNTRACK" >> src/config.h -echo "#define HAVE_IDN" >> src/config.h -echo "#define HAVE_DNSSEC" >> src/config.h mv po/no.po po/nb.po -export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie -DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC" +export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie" export LDFLAGS="-Wl,-z,relro,-z,now -pie" -make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" +# the dnsmasq make system hashes the configuration flags, so we have to supply the +# same flags for make and make install, else everything gets recompiled +%define _copts "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC" +make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" COPTS=%{_copts} make -C contrib/wrt %{?_smp_mflags} %pre @@ -122,7 +121,7 @@ %service_del_postun %{name}.service %install -make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk +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
