pool/avahi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=19

Browse Source
This commit is contained in:
OBS User unknown 2007-07-05 16:33:33 +00:00 committed by Git OBS Bridge
parent 1fc28c05ef
commit f3d1d7983f
3 changed files with 65 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
avahi-gacdir.patch
View File

@ -1,4 +1,6 @@
--- avahi-sharp.pc.in
Index: avahi-sharp.pc.in
===================================================================
--- avahi-sharp.pc.in.orig
+++ avahi-sharp.pc.in
@@ -1,6 +1,6 @@
prefix=@prefix@
@ -8,9 +10,11 @@
Name: avahi-sharp
Description: Mono bindings for the Avahi mDNS/DNS-SD stack
--- avahi-sharp/Makefile.am
Index: avahi-sharp/Makefile.am
===================================================================
--- avahi-sharp/Makefile.am.orig
+++ avahi-sharp/Makefile.am
@@ -75,10 +75,10 @@
@@ -75,10 +75,10 @@ monodoc_DATA = avahi-sharp-docs.zip avah
endif
install-data-hook: $(ASSEMBLY)
@ -23,9 +27,11 @@
endif
endif
--- avahi-sharp/Makefile.in
Index: avahi-sharp/Makefile.in
===================================================================
--- avahi-sharp/Makefile.in.orig
+++ avahi-sharp/Makefile.in
@@ -599,10 +599,10 @@
@@ -603,10 +603,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i
@HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
@ -38,3 +44,37 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: avahi-ui-sharp/Makefile.am
===================================================================
--- avahi-ui-sharp/Makefile.am.orig
+++ avahi-ui-sharp/Makefile.am
@@ -61,10 +61,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
endif
install-data-hook: $(ASSEMBLY)
- $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
uninstall-hook: $(ASSEMBLY)
- $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
endif
endif
Index: avahi-ui-sharp/Makefile.in
===================================================================
--- avahi-ui-sharp/Makefile.in.orig
+++ avahi-ui-sharp/Makefile.in
@@ -590,10 +590,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY)
@HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

7
avahi.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 5 17:38:41 CEST 2007 - maw@suse.de
- Don't remove libavahi-common.la, because many things depend on it
- Make avahi-mono require gtk-sharp2.
- Update avahi-gacdir.patch, fixing the build on biarch platforms.
-------------------------------------------------------------------
Thu Jul 5 02:19:19 CEST 2007 - maw@suse.de

16
avahi.spec
View File

@ -18,7 +18,7 @@ BuildRequires: libqt4-devel python-gtk-devel
BuildRequires: python-gtk qt-devel
%endif
Version: 0.6.20
Release: 2
Release: 3
URL: http://www.avahi.org/
Group: System/Daemons
License: LGPL v2 or later
@ -51,7 +51,7 @@ Group: System/Daemons
%py_requires
%package mono
Summary: D-BUS Service for Zeroconf/Bonjour
Requires: %{name} = %{version}
Requires: %{name} = %{version} gtk-sharp2
Autoreqprov: on
Group: Development/Libraries/Other
%package qt3
@ -391,7 +391,12 @@ make %{?jobs:-j%jobs}
%install
make DESTDIR=$RPM_BUILD_ROOT install
rm $RPM_BUILD_ROOT/usr/lib/libavahi-common.la
## WARNING: found empty dependency_libs variable. please remove the
## pointless libtool .la file
## /var/tmp/avahi-0.6.20-build/usr/lib64/lib\avahi-common.la
## If you don't understand this, mailto=rguenther@suse.de
## A number of packages want this file, however, so we won't remove it.
# rm $RPM_BUILD_ROOT/${_prefix}/${_lib}/libavahi-common.la
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
@ -568,6 +573,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*avahi-core.*a
%{_libdir}/*avahi-core*.so
%{_libdir}/*avahi-common*.so
%{_libdir}/*avahi-common*.*a
%{_libdir}/*avahi-glib*.*a
%{_libdir}/*avahi-glib*.so
%{_libdir}/*avahi-qt3*.*a
@ -585,6 +591,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Jul 05 2007 - maw@suse.de
- Don't remove libavahi-common.la, because many things depend on it
- Make avahi-mono require gtk-sharp2.
- Update avahi-gacdir.patch, fixing the build on biarch platforms.
* Thu Jul 05 2007 - maw@suse.de
- Remove some extraneous comments in the .spec file.
* Tue Jul 03 2007 - maw@suse.de
- Update to version 0.6.20: