Browse Source

avahi-0.7-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11553 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 6 years ago
parent
commit
53c1977a91
1 changed files with 76 additions and 71 deletions
  1. 76 71
      a/avahi/avahi-vl.spec

+ 76 - 71
a/avahi/avahi-vl.spec

@@ -1,4 +1,3 @@
-%define pythonlib %(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(0)')
 %define _localstatedir %{_var}
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
@@ -6,8 +5,8 @@
 Summary:        Local network service discovery 
 Summary(ja):	ローカルネットワークサービス検出システム
 Name:           avahi
-Version:        0.6.31
-Release:		5%{?_dist_release}
+Version:        0.7
+Release:		1%{?_dist_release}
 Group:          System Environment/Base
 License:        LGPL
 URL:            http://avahi.org
@@ -19,7 +18,7 @@ Patch10:		avahi-0.6.31-vine.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gtk2-devel, qt-devel, libglade2-devel, glib2-devel
-BuildRequires:  gtk3-devel
+BuildRequires:  gtk3-devel, gobject-introspection-devel
 BuildRequires:  qt4-devel
 BuildRequires:  libdaemon-devel >= 0.12
 BuildRequires:  libcap-devel, dbus-devel, expat-devel
@@ -329,14 +328,16 @@ necessary for developing programs using avahi.
 
 %prep
 %setup -q
-%patch0 -p1 -b .nodep
+#patch0 -p1 -b .nodep
 %patch10 -p1 -b .vine
 
 %build
 autoreconf -i
 
 %configure --with-distro=vine \
-  --disable-monodoc --without-python-twisted \
+  --disable-monodoc \
+  --without-python-twisted \
+  --disable-pygobject \
   --with-avahi-user=avahi --with-avahi-group=avahi \
   --enable-compat-howl --enable-compat-libdns_sd \
   --with-avahi-priv-access-group=avahi \
@@ -473,7 +474,7 @@ fi
 %postun -n compat32-%{name}-gobject -p /sbin/ldconfig
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root)
 %doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
 %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/avahi
@@ -488,11 +489,11 @@ fi
 %config %{_sysconfdir}/avahi/services/*
 %config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
 %attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/libavahi-common.so.*
-%attr(755,root,root) %{_libdir}/libavahi-core.so.*
-%attr(755,root,root) %{_libdir}/libavahi-client.so.*
-%attr(755,root,root) %{_libdir}/libhowl.so.*
-%attr(755,root,root) %{_libdir}/libdns_sd.so.*
+%{_libdir}/libavahi-common.so.*
+%{_libdir}/libavahi-core.so.*
+%{_libdir}/libavahi-client.so.*
+%{_libdir}/libhowl.so.*
+%{_libdir}/libdns_sd.so.*
 %attr(755,root,root) %{_datadir}/avahi
 %{_datadir}/locale/*
 %{_datadir}/dbus-1/interfaces/*.xml
@@ -502,20 +503,20 @@ fi
 %{_mandir}/man8/*
 
 %files tools
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_bindir}/*
-%{pythonlib}/*
-%attr(0644,root,root) %{_mandir}/man1/*
+%{python_sitelib}/*
+%{_mandir}/man1/*
 %{_datadir}/avahi/interfaces/
 %{_datadir}/applications/*
 
 %files devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-common.so
-%attr(755,root,root) %{_libdir}/libavahi-core.so
-%attr(755,root,root) %{_libdir}/libavahi-client.so
-%attr(755,root,root) %{_libdir}/libhowl.so
-%attr(755,root,root) %{_libdir}/libdns_sd.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-common.so
+%{_libdir}/libavahi-core.so
+%{_libdir}/libavahi-client.so
+%{_libdir}/libhowl.so
+%{_libdir}/libdns_sd.so
 %{_includedir}/avahi-client
 %{_includedir}/avahi-common
 %{_includedir}/avahi-core
@@ -527,137 +528,141 @@ fi
 %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
 
 %files ui
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_libdir}/libavahi-ui.so.*
 
 %files ui-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-ui.so
-%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-ui.so
+%{_libdir}/libavahi-ui-gtk3.so
 %{_includedir}/avahi-ui
 %{_libdir}/pkgconfig/avahi-ui.pc
 %{_libdir}/pkgconfig/avahi-ui-gtk3.pc
 
 %files ui-gtk3
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_libdir}/libavahi-ui-gtk3.so.*
 
 %files glib
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_libdir}/libavahi-glib.so.*
 
 %files glib-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-glib.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-glib.so
 %{_includedir}/avahi-glib
 %{_libdir}/pkgconfig/avahi-glib.pc
 
 %files gobject
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_libdir}/libavahi-gobject.so.*
 
 %files gobject-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-gobject.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-gobject.so
 %{_includedir}/avahi-gobject
 %{_libdir}/pkgconfig/avahi-gobject.pc
 
 %files qt3
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-qt3.so.*
+%defattr(-, root, root)
+%{_libdir}/libavahi-qt3.so.*
 
 %files qt3-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-qt3.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-qt3.so
 %{_includedir}/avahi-qt3
 %{_libdir}/pkgconfig/avahi-qt3.pc
 
 %files qt4
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-qt4.so.*
+%defattr(-, root, root)
+%{_libdir}/libavahi-qt4.so.*
 
 %files qt4-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-qt4.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-qt4.so
 %{_includedir}/avahi-qt4/
 %{_libdir}/pkgconfig/avahi-qt4.pc
 
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}
-%defattr(0644,root,root,0755)
-%attr(755,root,root) %{_libdir}/libavahi-common.so.*
-%attr(755,root,root) %{_libdir}/libavahi-core.so.*
-%attr(755,root,root) %{_libdir}/libavahi-client.so.*
-%attr(755,root,root) %{_libdir}/libhowl.so.*
-%attr(755,root,root) %{_libdir}/libdns_sd.so.*
+%defattr(-, root, root)
+%{_libdir}/libavahi-common.so.*
+%{_libdir}/libavahi-core.so.*
+%{_libdir}/libavahi-client.so.*
+%{_libdir}/libhowl.so.*
+%{_libdir}/libdns_sd.so.*
 %{_libdir}/avahi
 
 %files -n compat32-%{name}-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-common.so
-%attr(755,root,root) %{_libdir}/libavahi-core.so
-%attr(755,root,root) %{_libdir}/libavahi-client.so
-%attr(755,root,root) %{_libdir}/libhowl.so
-%attr(755,root,root) %{_libdir}/libdns_sd.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-common.so
+%{_libdir}/libavahi-core.so
+%{_libdir}/libavahi-client.so
+%{_libdir}/libhowl.so
+%{_libdir}/libdns_sd.so
 %{_libdir}/pkgconfig/avahi-core.pc
 %{_libdir}/pkgconfig/avahi-client.pc
 %{_libdir}/pkgconfig/avahi-compat-howl.pc
 %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
 
 %files -n compat32-%{name}-ui
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_libdir}/libavahi-ui.so.*
 
 %files -n compat32-%{name}-ui-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-ui.so
-%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-ui.so
+%{_libdir}/libavahi-ui-gtk3.so
 %{_libdir}/pkgconfig/avahi-ui.pc
 %{_libdir}/pkgconfig/avahi-ui-gtk3.pc
 
 %files -n compat32-%{name}-ui-gtk3
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_libdir}/libavahi-ui-gtk3.so.*
 
 %files -n compat32-%{name}-glib
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_libdir}/libavahi-glib.so.*
 
 %files -n compat32-%{name}-glib-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-glib.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-glib.so
 %{_libdir}/pkgconfig/avahi-glib.pc
 
 %files -n compat32-%{name}-gobject
-%defattr(0755, root, root, 0755)
+%defattr(-, root, root)
 %{_libdir}/libavahi-gobject.so.*
 
 %files -n compat32-%{name}-gobject-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-gobject.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-gobject.so
 %{_libdir}/pkgconfig/avahi-gobject.pc
 
 %files -n compat32-%{name}-qt3
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-qt3.so.*
+%defattr(-, root, root)
+%{_libdir}/libavahi-qt3.so.*
 
 %files -n compat32-%{name}-qt3-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-qt3.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-qt3.so
 %{_libdir}/pkgconfig/avahi-qt3.pc
 
 %files -n compat32-%{name}-qt4
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-qt4.so.*
+%defattr(-, root, root)
+%{_libdir}/libavahi-qt4.so.*
 
 %files -n compat32-%{name}-qt4-devel
-%defattr(0644, root, root, 0755)
-%attr(755,root,root) %{_libdir}/libavahi-qt4.so
+%defattr(-, root, root)
+%{_libdir}/libavahi-qt4.so
 %{_libdir}/pkgconfig/avahi-qt4.pc
 %endif
 
 %changelog
+* Tue Feb 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7-1
+- new upstream release.
+- fixed illegal %%attr.
+
 * Thu Jun 30 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.31-5
 - rebuild with gcc-5.4.0