Accepting request 695286 from GNOME:Factory
- Drop -Qt4 variant: Qt4 is EOL. what is upstream (boo#1110668). (forwarded request 695154 from dimstar) OBS-URL: https://build.opensuse.org/request/show/695286 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=126
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2c2be38617
@ -43,7 +43,7 @@ Release: 0
|
||||
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: gdbm-devel
|
||||
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 @@ sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am
|
||||
%build
|
||||
autoreconf -f -i
|
||||
intltoolize -f
|
||||
export PYTHON=/usr/bin/python3
|
||||
export PYTHON=%{_bindir}/python3
|
||||
%configure\
|
||||
--libexecdir=%{_prefix}/lib\
|
||||
--disable-static\
|
||||
|
||||
@ -43,7 +43,7 @@ Release: 0
|
||||
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: gdbm-devel
|
||||
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 @@ correct mDNS reflection across LAN segments.
|
||||
%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 @@ sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am
|
||||
%build
|
||||
autoreconf -f -i
|
||||
intltoolize -f
|
||||
export PYTHON=/usr/bin/python3
|
||||
export PYTHON=%{_bindir}/python3
|
||||
%configure\
|
||||
--libexecdir=%{_prefix}/lib\
|
||||
--disable-static\
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 23 13:37:26 UTC 2017 - rbrown@suse.com
|
||||
|
||||
- Replace references to /var/adm/fillup-templates with new
|
||||
%_fillupdir macro (boo#1069468)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 17 13:52:41 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
- Remove redundant tags/sections from specfile
|
||||
- Use %_smp_mflags for parallel build
|
||||
- Add libavahi-devel to baselibs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 12 18:57:25 UTC 2011 - andrea.turrini@gmail.com
|
||||
|
||||
- Fixed typo in avahi-qt4.spec.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz
|
||||
|
||||
- Added support for translation-update-upstream (FATE#301344).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com
|
||||
|
||||
- use new python macros
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 1 10:22:46 CEST 2008 - meissner@suse.de
|
||||
|
||||
- Added GCC attribute alloc_size markup for allocator functions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 18 17:18:20 CEST 2008 - sbrabec@suse.cz
|
||||
|
||||
- Updated to version 0.6.23:
|
||||
* A lot of translation updates
|
||||
* Beef up bnvc quite a bit, including passing a domain to browse
|
||||
in
|
||||
* Increase numer of open files resource limit to 300 so that we
|
||||
can deal with more clients simultaneously.
|
||||
* Rework 'poof' algorithm a bit to reduce traffic load on noisy
|
||||
links.
|
||||
* Build fixes
|
||||
* Minor other updates
|
||||
* Backwards compatible with Avahi 0.6.x with x < 23.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 11 11:49:29 CEST 2008 - coolo@suse.de
|
||||
|
||||
- fix rename of xxbit packages
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 5 16:14:36 CET 2008 - sbrabec@suse.cz
|
||||
|
||||
- Create new spec file to avoid dependency of avahi core on Qt.
|
||||
|
||||
1140
avahi-qt4.spec
1140
avahi-qt4.spec
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 12:36:40 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop -Qt4 variant: Qt4 is EOL.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 17 09:47:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
@ -10,7 +15,7 @@ Sun Mar 17 09:47:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
Fri Jan 4 00:40:38 UTC 2019 - mgorse@suse.com
|
||||
|
||||
- Replace avahi-0.7-python3.patch with avahi-0.7-dbm.patch: use
|
||||
what is upstream (boo#1110668).
|
||||
what is upstream (boo#1110668).
|
||||
- Add avahi-0.7-encode-strings-as-utf8.patch: encode strings as
|
||||
UTF-8 (boo#1110668).
|
||||
- Add avahi-0.7-python3-bookmarks.patch: make bookmarks python 3
|
||||
|
||||
@ -45,7 +45,7 @@ Release: 0
|
||||
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: gdbm-devel
|
||||
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 @@ sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am
|
||||
%build
|
||||
autoreconf -f -i
|
||||
intltoolize -f
|
||||
export PYTHON=/usr/bin/python3
|
||||
export PYTHON=%{_bindir}/python3
|
||||
%configure\
|
||||
--libexecdir=%{_prefix}/lib\
|
||||
--disable-static\
|
||||
|
||||
@ -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 @@ sed '
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user