Author: lisu Date: Wed Jul 7 10:21:44 2010 GMT Module: packages Tag: HEAD ---- Log message: - start update to 0.6.26 - patches updated - add gtk3 bcond - more TODO
---- Files affected: packages/avahi: avahi.spec (1.114 -> 1.115) ---- Diffs: ================================================================ Index: packages/avahi/avahi.spec diff -u packages/avahi/avahi.spec:1.114 packages/avahi/avahi.spec:1.115 --- packages/avahi/avahi.spec:1.114 Fri Jun 11 13:43:28 2010 +++ packages/avahi/avahi.spec Wed Jul 7 12:21:38 2010 @@ -2,11 +2,15 @@ # # TODO: # - finish with_apidocs +# - check BRs for gtk+3 +# - make gtk3 bcond enabled by default when gtk+3 will be stable +# - files # # Conditional build: %bcond_with apidocs # build API documentation %bcond_without dotnet # build without dotnet bindings %bcond_without gtk # build without GTK+ +%bcond_with gtk3 # build without GTK+3 %bcond_without pygtk # build without PyGTK %bcond_without qt # build without (any) qt bindings %bcond_without qt3 # build without qt3 bindings @@ -28,12 +32,12 @@ Summary: Free mDNS/DNS-SD/Zeroconf implementation Summary(pl.UTF-8): Wolna implementacja mDNS/DNS-SD/Zeroconf Name: avahi -Version: 0.6.25 -Release: 7 +Version: 0.6.26 +Release: 0.1 License: LGPL v2.1+ Group: Applications Source0: http://avahi.org/download/%{name}-%{version}.tar.gz -# Source0-md5: a83155a6e29e3988f07e5eea3287b21e +# Source0-md5: 2b2b1899fcec5ae74e92f111598913a1 Source1: %{name}-daemon Source2: %{name}-dnsconfd Source3: %{name}.png @@ -63,6 +67,11 @@ BuildRequires: gtk+2-devel >= 2:2.10.2 BuildRequires: libglade2-devel >= 1:2.6.0 %endif +%if %{with gtk3} +BuildRequires: glib2-devel +BuildRequires: gtk+3-devel +BuildRequires: libglade2-devel +%endif BuildRequires: intltool >= 0.35 BuildRequires: libcap-devel BuildRequires: libdaemon-devel >= 0.11 @@ -602,6 +611,7 @@ --with-distro=none \ %{!?with_apidocs:--disable-doxygen-doc} \ %{!?with_gtk:--disable-gtk} \ + %{!?with_gtk3:--disable-gtk3} \ %{!?with_pygtk:--disable-pygtk} \ %{!?with_qt3:--disable-qt3} \ %{!?with_qt4:--disable-qt4} \ @@ -733,8 +743,8 @@ %attr(755,root,root) %{_sbindir}/avahi-daemon %attr(755,root,root) %{_sbindir}/avahi-dnsconfd -%dir %{_datadir}/%{name}/introspection -%{_datadir}/%{name}/introspection/*.introspect +#%%dir %{_datadir}/%{name}/introspection +#%%{_datadir}/%{name}/introspection/*.introspect %{_datadir}/%{name}/avahi-service.dtd %{_datadir}/%{name}/service-types %dir %{_libdir}/%{name} @@ -774,7 +784,7 @@ %attr(755,root,root) %{_libdir}/libavahi-common.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libavahi-common.so.3 %attr(755,root,root) %{_libdir}/libavahi-core.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavahi-core.so.6 +%attr(755,root,root) %ghost %{_libdir}/libavahi-core.so.7 # common for -discover* %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/interfaces @@ -803,26 +813,26 @@ %if %{with gtk} %files ui %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/bshell -%attr(755,root,root) %{_bindir}/bssh -%attr(755,root,root) %{_bindir}/bvnc -%attr(755,root,root) %{_libdir}/libavahi-ui.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavahi-ui.so.0 +#%%attr(755,root,root) %{_bindir}/bshell +#%%attr(755,root,root) %{_bindir}/bssh +#%%attr(755,root,root) %{_bindir}/bvnc +#%%attr(755,root,root) %{_libdir}/libavahi-ui.so.*.*.* +#%%attr(755,root,root) %ghost %{_libdir}/libavahi-ui.so.0 %{_mandir}/man1/bssh.1* %{_mandir}/man1/bvnc.1* -%{_desktopdir}/bssh.desktop -%{_desktopdir}/bvnc.desktop +#%%{_desktopdir}/bssh.desktop +#%%{_desktopdir}/bvnc.desktop %files ui-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libavahi-ui.so -%{_libdir}/libavahi-ui.la -%{_includedir}/avahi-ui +#%%attr(755,root,root) %{_libdir}/libavahi-ui.so +#%%{_libdir}/libavahi-ui.la +#%%{_includedir}/avahi-ui %{_pkgconfigdir}/avahi-ui.pc %files ui-static %defattr(644,root,root,755) -%{_libdir}/libavahi-ui.a +#%%{_libdir}/libavahi-ui.a %endif %files compat-libdns_sd @@ -963,7 +973,7 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/avahi-discover %{py_sitedir}/avahi_discover -%{_datadir}/%{name}/interfaces/avahi-discover.glade +#%%{_datadir}/%{name}/interfaces/avahi-discover.glade %{_desktopdir}/avahi-discover.desktop %{_pixmapsdir}/avahi.png %{_mandir}/man1/avahi-discover.1* @@ -972,8 +982,8 @@ %if %{with gtk} %files discover-standalone %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/avahi-discover-standalone -%{_datadir}/%{name}/interfaces/avahi-discover-standalone.glade +#%%attr(755,root,root) %{_bindir}/avahi-discover-standalone +#%%{_datadir}/%{name}/interfaces/avahi-discover-standalone.glade %endif %files utils @@ -1001,6 +1011,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.115 2010/07/07 10:21:38 lisu +- start update to 0.6.26 +- patches updated +- add gtk3 bcond +- more TODO + Revision 1.114 2010/06/11 11:43:28 jajcus - without gtk and without pygtk bconds for GUI-free builds - BR: graphviz back, now in the 'apidocs' bcond (it was require for API ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi.spec?r1=1.114&r2=1.115&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
