SPECS (DEVEL): NetworkManager.spec - current snap - pld patches incorporate...

patrys patrys at pld-linux.org
Wed Sep 3 22:03:18 CEST 2008 

Author: patrys                       Date: Wed Sep  3 20:03:18 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- current snap
- pld patches incorporated into the tarball (http://bugzilla.gnome.org/show_bug.cgi?id=550714)

---- Files affected:
SPECS:
   NetworkManager.spec (1.39.2.9 -> 1.39.2.10) 

---- Diffs:

================================================================
Index: SPECS/NetworkManager.spec
diff -u SPECS/NetworkManager.spec:1.39.2.9 SPECS/NetworkManager.spec:1.39.2.10
--- SPECS/NetworkManager.spec:1.39.2.9	Fri Aug 29 19:42:52 2008
+++ SPECS/NetworkManager.spec	Wed Sep  3 22:03:12 2008
@@ -2,20 +2,18 @@
 # TODO:
 # - add a working(!) pld backend... (it work's 4 me as it is now - czarny)
 #
-%define		rev rev3588
+%define		rev svn4027
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
-Version:	0.7
-Release:	0.%{rev}.2
+Version:	0.7.0
+Release:	0.%{rev}.1
 License:	GPL v2
 Group:		X11/Applications
 #Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/%{name}-%{version}.tar.bz2
-Source0:	%{name}-%{version}%{rev}.tar.bz2
-# Source0-md5:	98f1fffeb6e3bcfac5461a5b83cd9bfb
-Source1:	%{name}.init
-Source2:	%{name}Dispatcher.init
-Patch0:		%{name}-pld.patch
+Source0:	%{name}-%{version}.tar.gz
+# Source0-md5:	214567f13871e081365eea58bfe26077
+BuildRequires:	PolicyKit-devel
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.74-2
@@ -35,6 +33,7 @@
 Requires(post):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	PolicyKit
 Requires:	rc-scripts
 Requires:	wpa_supplicant >= 0.6-2
 Obsoletes:	dhcdbd < 3.0-1
@@ -50,6 +49,18 @@
 %description -l pl.UTF-8
 Zarządca sieci dla GNOME.
 
+%package apidocs
+Summary:	libnm-glib library API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki libnm-glib
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+libnm-glib library API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libnm-glib.
+
 %package libs
 Summary:	Network Manager shared libraries
 Summary(pl.UTF-8):	Biblioteki dzielone Network Managera
@@ -88,11 +99,7 @@
 Statyczne biblioteki Network Managera.
 
 %prep
-%setup -q -n %{name}-%{version}%{rev}
-%patch0 -p1
-%if "%{rev}" == "rev3588"
-%{__sed} -i -e 's,-Werror,,' configure.in
-%endif
+%setup -q
 
 %build
 %{__glib_gettextize}
@@ -103,6 +110,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
+	--with-html-dir=%{_gtkdocdir} \
 	--with-distro=pld
 %{__make}
 
@@ -115,9 +123,6 @@
 
 install test/nm-tool $RPM_BUILD_ROOT%{_bindir}/nm-tool
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/NetworkManager
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/NetworkManagerDispatcher
-
 # Cleanup
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.{a,la}
@@ -131,16 +136,12 @@
 
 %post
 /sbin/chkconfig --add NetworkManager
-/sbin/chkconfig --add NetworkManagerDispatcher
 %service NetworkManager restart "NetworkManager daemon"
-%service NetworkManagerDispatcher restart "NetworkManagerDispatcher daemon"
 
 %preun
 if [ "$1" = "0" ]; then
 	%service NetworkManager stop
-	%service NetworkManagerDispatcher stop
 	/sbin/chkconfig --del NetworkManager
-	/sbin/chkconfig --del NetworkManagerDispatcher
 fi
 
 %post	libs -p /sbin/ldconfig
@@ -151,29 +152,37 @@
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/nm-tool
 %attr(755,root,root) %{_sbindir}/NetworkManager
-%attr(755,root,root) %{_sbindir}/NetworkManagerDispatcher
 %attr(755,root,root) %{_sbindir}/nm-system-settings
 %dir %{_libdir}/NetworkManager
 %attr(755,root,root) %{_libexecdir}/nm-crash-logger
 %attr(755,root,root) %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
+%attr(755,root,root) %{_libexecdir}/nm-avahi-autoipd.action
 %attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action
+%attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
+%attr(755,root,root) %{_libexecdir}/libnm-settings-plugin-ifcfg-pld.so
 %attr(755,root,root) %{_libexecdir}/libnm-settings-plugin-keyfile.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
-%attr(754,root,root) /etc/rc.d/init.d/NetworkManagerDispatcher
 %dir %{_sysconfdir}/NetworkManager
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
 %dir %{_sysconfdir}/NetworkManager/VPN
 %dir %{_datadir}/%{name}
 %dir /var/run/%{name}
+%{_datadir}/PolicyKit/policy/org.freedesktop.network-manager-settings.system.policy
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_datadir}/%{name}/gdb-cmd
 %{_mandir}/man8/NetworkManager.8*
-%{_mandir}/man8/NetworkManagerDispatcher.8*
 %{_mandir}/man1/nm-tool.1*
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dhcp-client.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-avahi-autoipd.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-system-settings.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libnm-glib
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnm-util.so.*.*.*
@@ -195,6 +204,7 @@
 %{_includedir}/libnm-glib
 %{_pkgconfigdir}/NetworkManager.pc
 %{_pkgconfigdir}/libnm-util.pc
+%{_pkgconfigdir}/libnm_glib_vpn.pc
 %{_pkgconfigdir}/libnm_glib.pc
 
 %files static
@@ -209,6 +219,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39.2.10  2008/09/03 20:03:12  patrys
+- current snap
+- pld patches incorporated into the tarball (http://bugzilla.gnome.org/show_bug.cgi?id=550714)
+
 Revision 1.39.2.9  2008/08/29 17:42:52  glen
 - misplaced comment
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/NetworkManager.spec?r1=1.39.2.9&r2=1.39.2.10&f=u

More information about the pld-cvs-commit mailing list