This commit is contained in:
parent
0cc17c674c
commit
25ab3ff72f
@ -31,7 +31,7 @@ Name: avahi-glib2
|
|||||||
%define build_qt3 0
|
%define build_qt3 0
|
||||||
%define build_qt4 0
|
%define build_qt4 0
|
||||||
Version: 0.6.23
|
Version: 0.6.23
|
||||||
Release: 11
|
Release: 12
|
||||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||||
# Create split spec files only when building per partes:
|
# Create split spec files only when building per partes:
|
||||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||||
@ -948,7 +948,9 @@ cd ..
|
|||||||
%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
||||||
%endif
|
%endif
|
||||||
%if %build_core
|
%if %build_core
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/libavahi-common.la
|
# do not remove this unless you plan to fix _all_ the references to
|
||||||
|
# it. all (multiple) previous attempts have failed already
|
||||||
|
#rm $RPM_BUILD_ROOT%{_libdir}/libavahi-common.la
|
||||||
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
||||||
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
||||||
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
||||||
@ -1201,6 +1203,9 @@ fi
|
|||||||
%{_libdir}/libavahi-core.*a
|
%{_libdir}/libavahi-core.*a
|
||||||
%{_libdir}/libavahi-core*.so
|
%{_libdir}/libavahi-core*.so
|
||||||
%{_libdir}/libavahi-common*.so
|
%{_libdir}/libavahi-common*.so
|
||||||
|
# do not remove unless you fix the resulting problems
|
||||||
|
# reference is in libavahi-client.la
|
||||||
|
%{_libdir}/libavahi-common*.*a
|
||||||
%{_libdir}/pkgconfig/avahi-client.pc
|
%{_libdir}/pkgconfig/avahi-client.pc
|
||||||
%{_libdir}/pkgconfig/avahi-core.pc
|
%{_libdir}/pkgconfig/avahi-core.pc
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ Name: avahi-mono
|
|||||||
%define build_qt3 0
|
%define build_qt3 0
|
||||||
%define build_qt4 0
|
%define build_qt4 0
|
||||||
Version: 0.6.23
|
Version: 0.6.23
|
||||||
Release: 59
|
Release: 60
|
||||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||||
# Create split spec files only when building per partes:
|
# Create split spec files only when building per partes:
|
||||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||||
@ -947,7 +947,9 @@ cd ..
|
|||||||
%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
||||||
%endif
|
%endif
|
||||||
%if %build_core
|
%if %build_core
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/libavahi-common.la
|
# do not remove this unless you plan to fix _all_ the references to
|
||||||
|
# it. all (multiple) previous attempts have failed already
|
||||||
|
#rm $RPM_BUILD_ROOT%{_libdir}/libavahi-common.la
|
||||||
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
||||||
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
||||||
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
||||||
@ -1200,6 +1202,9 @@ fi
|
|||||||
%{_libdir}/libavahi-core.*a
|
%{_libdir}/libavahi-core.*a
|
||||||
%{_libdir}/libavahi-core*.so
|
%{_libdir}/libavahi-core*.so
|
||||||
%{_libdir}/libavahi-common*.so
|
%{_libdir}/libavahi-common*.so
|
||||||
|
# do not remove unless you fix the resulting problems
|
||||||
|
# reference is in libavahi-client.la
|
||||||
|
%{_libdir}/libavahi-common*.*a
|
||||||
%{_libdir}/pkgconfig/avahi-client.pc
|
%{_libdir}/pkgconfig/avahi-client.pc
|
||||||
%{_libdir}/pkgconfig/avahi-core.pc
|
%{_libdir}/pkgconfig/avahi-core.pc
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ Name: avahi-qt4
|
|||||||
%define build_qt3 0
|
%define build_qt3 0
|
||||||
%define build_qt4 1
|
%define build_qt4 1
|
||||||
Version: 0.6.23
|
Version: 0.6.23
|
||||||
Release: 11
|
Release: 12
|
||||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||||
# Create split spec files only when building per partes:
|
# Create split spec files only when building per partes:
|
||||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||||
@ -950,7 +950,9 @@ cd ..
|
|||||||
%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
||||||
%endif
|
%endif
|
||||||
%if %build_core
|
%if %build_core
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/libavahi-common.la
|
# do not remove this unless you plan to fix _all_ the references to
|
||||||
|
# it. all (multiple) previous attempts have failed already
|
||||||
|
#rm $RPM_BUILD_ROOT%{_libdir}/libavahi-common.la
|
||||||
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
||||||
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
||||||
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
||||||
@ -1203,6 +1205,9 @@ fi
|
|||||||
%{_libdir}/libavahi-core.*a
|
%{_libdir}/libavahi-core.*a
|
||||||
%{_libdir}/libavahi-core*.so
|
%{_libdir}/libavahi-core*.so
|
||||||
%{_libdir}/libavahi-common*.so
|
%{_libdir}/libavahi-common*.so
|
||||||
|
# do not remove unless you fix the resulting problems
|
||||||
|
# reference is in libavahi-client.la
|
||||||
|
%{_libdir}/libavahi-common*.*a
|
||||||
%{_libdir}/pkgconfig/avahi-client.pc
|
%{_libdir}/pkgconfig/avahi-client.pc
|
||||||
%{_libdir}/pkgconfig/avahi-core.pc
|
%{_libdir}/pkgconfig/avahi-core.pc
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 16 12:01:12 CET 2009 - ro@suse.de
|
||||||
|
|
||||||
|
- readd libavahi-common.la, breaks > 100 packages if done this way
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 14 14:17:05 CET 2009 - sbrabec@suse.cz
|
Wed Jan 14 14:17:05 CET 2009 - sbrabec@suse.cz
|
||||||
|
|
||||||
|
11
avahi.spec
11
avahi.spec
@ -33,7 +33,7 @@ Name: avahi
|
|||||||
%define build_qt3 0
|
%define build_qt3 0
|
||||||
%define build_qt4 0
|
%define build_qt4 0
|
||||||
Version: 0.6.23
|
Version: 0.6.23
|
||||||
Release: 40
|
Release: 41
|
||||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||||
# Create split spec files only when building per partes:
|
# Create split spec files only when building per partes:
|
||||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||||
@ -950,7 +950,9 @@ cd ..
|
|||||||
%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
%__make %{?jobs:-j%jobs} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT
|
||||||
%endif
|
%endif
|
||||||
%if %build_core
|
%if %build_core
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/libavahi-common.la
|
# do not remove this unless you plan to fix _all_ the references to
|
||||||
|
# it. all (multiple) previous attempts have failed already
|
||||||
|
#rm $RPM_BUILD_ROOT%{_libdir}/libavahi-common.la
|
||||||
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
||||||
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
||||||
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
||||||
@ -1203,6 +1205,9 @@ fi
|
|||||||
%{_libdir}/libavahi-core.*a
|
%{_libdir}/libavahi-core.*a
|
||||||
%{_libdir}/libavahi-core*.so
|
%{_libdir}/libavahi-core*.so
|
||||||
%{_libdir}/libavahi-common*.so
|
%{_libdir}/libavahi-common*.so
|
||||||
|
# do not remove unless you fix the resulting problems
|
||||||
|
# reference is in libavahi-client.la
|
||||||
|
%{_libdir}/libavahi-common*.*a
|
||||||
%{_libdir}/pkgconfig/avahi-client.pc
|
%{_libdir}/pkgconfig/avahi-client.pc
|
||||||
%{_libdir}/pkgconfig/avahi-core.pc
|
%{_libdir}/pkgconfig/avahi-core.pc
|
||||||
|
|
||||||
@ -1316,6 +1321,8 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 16 2009 ro@suse.de
|
||||||
|
- readd libavahi-common.la, breaks > 100 packages if done this way
|
||||||
* Wed Jan 14 2009 sbrabec@suse.cz
|
* Wed Jan 14 2009 sbrabec@suse.cz
|
||||||
- avahi-glib2-utils-gtk renamed back to its correct name
|
- avahi-glib2-utils-gtk renamed back to its correct name
|
||||||
avahi-utils-gtk (bnc#456418).
|
avahi-utils-gtk (bnc#456418).
|
||||||
|
Loading…
Reference in New Issue
Block a user