commit avahi for openSUSE:Factory

3 May 2019

Hello community,

here is the log from the commit of package avahi for openSUSE:Factory checked in at 2019-05-03 22:08:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/avahi (Old)
 and      /work/SRC/openSUSE:Factory/.avahi.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "avahi"

Fri May  3 22:08:46 2019 rev:126 rq:695286 version:0.7

Changes:
--------
avahi-mono.changes: same change

--- /work/SRC/openSUSE:Factory/avahi/avahi.changes	2019-03-22 14:57:21.721951035 +0100
+++ /work/SRC/openSUSE:Factory/.avahi.new.5148/avahi.changes	2019-05-03 22:08:47.615078892 +0200
@@ -1,0 +2,5 @@
+Wed Apr 17 12:36:40 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Drop -Qt4 variant: Qt4 is EOL.
+
+-------------------------------------------------------------------

Old:
----
  avahi-qt4.changes
  avahi-qt4.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ avahi-glib2.spec ++++++
--- /var/tmp/diff_new_pack.NTLvhm/_old	2019-05-03 22:08:49.187082029 +0200
+++ /var/tmp/diff_new_pack.NTLvhm/_new	2019-05-03 22:08:49.199082053 +0200
@@ -43,7 +43,7 @@
 Summary:        D-Bus Service for Zeroconf and Bonjour
 License:        LGPL-2.1-or-later
 Group:          System/Daemons
-Url:            http://www.avahi.org/
+URL:            http://www.avahi.org/
 Source:         http://avahi.org/download/%{_name}-%{version}.tar.gz
 # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
 Source1:        avahi-daemon-check-dns.sh
@@ -83,12 +83,12 @@
 BuildRequires:  intltool
 BuildRequires:  libdaemon-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  python3-dbus-python
 # libtool is needed to build all variants: bootstrap is unconditional in the build section
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 # Even if we are not building python bindings, we need python to build service types database:
 BuildRequires:  python3-dbm
+BuildRequires:  python3-dbus-python
 BuildRequires:  python3-devel
 BuildRequires:  translation-update-upstream
 # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
@@ -702,7 +702,7 @@
 %build
 autoreconf -f -i
 intltoolize -f
-export PYTHON=/usr/bin/python3
+export PYTHON=%{_bindir}/python3
 %configure\
 	--libexecdir=%{_prefix}/lib\
 	--disable-static\

++++++ avahi-mono.spec ++++++
--- /var/tmp/diff_new_pack.NTLvhm/_old	2019-05-03 22:08:49.255082165 +0200
+++ /var/tmp/diff_new_pack.NTLvhm/_new	2019-05-03 22:08:49.279082212 +0200
@@ -43,7 +43,7 @@
 Summary:        Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
 License:        LGPL-2.1-or-later
 Group:          Development/Languages/Mono
-Url:            http://www.avahi.org/
+URL:            http://www.avahi.org/
 Source:         http://avahi.org/download/%{_name}-%{version}.tar.gz
 # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
 Source1:        avahi-daemon-check-dns.sh
@@ -83,12 +83,12 @@
 BuildRequires:  intltool
 BuildRequires:  libdaemon-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  python3-dbus-python
 # libtool is needed to build all variants: bootstrap is unconditional in the build section
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 # Even if we are not building python bindings, we need python to build service types database:
 BuildRequires:  python3-dbm
+BuildRequires:  python3-dbus-python
 BuildRequires:  python3-devel
 BuildRequires:  translation-update-upstream
 # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
@@ -637,7 +637,6 @@
 %if %{build_mono}
 %package -n avahi-mono
 Summary:        Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
-License:        LGPL-2.1-or-later
 Group:          Development/Languages/Mono
 Requires:       gtk-sharp2
 Requires:       libavahi-client3 >= %{version}
@@ -702,7 +701,7 @@
 %build
 autoreconf -f -i
 intltoolize -f
-export PYTHON=/usr/bin/python3
+export PYTHON=%{_bindir}/python3
 %configure\
 	--libexecdir=%{_prefix}/lib\
 	--disable-static\

++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.NTLvhm/_old	2019-05-03 22:08:49.323082301 +0200
+++ /var/tmp/diff_new_pack.NTLvhm/_new	2019-05-03 22:08:49.343082340 +0200
@@ -45,7 +45,7 @@
 Summary:        D-Bus Service for Zeroconf and Bonjour
 License:        LGPL-2.1-or-later
 Group:          System/Daemons
-Url:            http://www.avahi.org/
+URL:            http://www.avahi.org/
 Source:         http://avahi.org/download/%{_name}-%{version}.tar.gz
 # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
 Source1:        avahi-daemon-check-dns.sh
@@ -85,12 +85,12 @@
 BuildRequires:  intltool
 BuildRequires:  libdaemon-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  python3-dbus-python
 # libtool is needed to build all variants: bootstrap is unconditional in the build section
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 # Even if we are not building python bindings, we need python to build service types database:
 BuildRequires:  python3-dbm
+BuildRequires:  python3-dbus-python
 BuildRequires:  python3-devel
 BuildRequires:  translation-update-upstream
 # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
@@ -704,7 +704,7 @@
 %build
 autoreconf -f -i
 intltoolize -f
-export PYTHON=/usr/bin/python3
+export PYTHON=%{_bindir}/python3
 %configure\
 	--libexecdir=%{_prefix}/lib\
 	--disable-static\

++++++ avahi_spec-prepare.sh ++++++
--- /var/tmp/diff_new_pack.NTLvhm/_old	2019-05-03 22:08:49.559082771 +0200
+++ /var/tmp/diff_new_pack.NTLvhm/_new	2019-05-03 22:08:49.559082771 +0200
@@ -3,7 +3,6 @@
 # Autobuild doesn't support package names with macros. This script will update versions in package names.
 
 ORIG_SPEC=${2%-mono}
-ORIG_SPEC=${ORIG_SPEC%-qt4}
 # Never update -mono file when it is already opened. It will break advanced build scripts:
 if test "$2" != "$ORIG_SPEC" ; then
     exit
@@ -43,22 +42,6 @@
 perl $1/update_spec.pl $1/$ORIG_SPEC-glib2.spec.new attributes > $1/$ORIG_SPEC-glib2.spec
 rm $1/$ORIG_SPEC-glib2.spec.new
 
-# Edit file to fit -qt4 build needs:
-sed '
-    s/spec file for package avahi/spec file for package avahi-qt4/;
-    s/build_core\ 1/build_core 0/;
-    s/build_qt4\ 0/build_qt4 1/;
-    s/^.ame:.*/&-qt4/;
-    # No more needed.
-    #s/^..hangelog.*/& qt/;
-    /^# WARNING: After editing/,/^# to update spec files/d
-    /^%define[[:space:]]*_name/i \
-# Do not edit this auto generated file! Edit avahi.spec.
-' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-qt4.spec.new
-perl $1/update_spec.pl $1/$ORIG_SPEC-qt4.spec.new attributes > $1/$ORIG_SPEC-qt4.spec
-rm $1/$ORIG_SPEC-qt4.spec.new
-
-
 # Not wanted for avahi:
 #cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-glib2.changes
 #cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-mono.changes

    

root

tags

participants (1)