SPECS: NetworkManager.spec - merged from DEVEL - release 1 (works for me)

megabajt megabajt at pld-linux.org
Thu Nov 27 17:49:28 CET 2008 

Author: megabajt                     Date: Thu Nov 27 16:49:28 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL
- release 1 (works for me)

---- Files affected:
SPECS:
   NetworkManager.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/NetworkManager.spec
diff -u SPECS/NetworkManager.spec:1.46 SPECS/NetworkManager.spec:1.47
--- SPECS/NetworkManager.spec:1.46	Thu Nov 20 18:02:15 2008
+++ SPECS/NetworkManager.spec	Thu Nov 27 17:49:22 2008
@@ -5,53 +5,66 @@
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
-Version:	0.6.6
-Release:	4
+Version:	0.7.0
+Release:	1
 License:	GPL v2
-Group:		X11/Applications
-Source0:	http://people.redhat.com/dcbw/NetworkManager/0.6.6/%{name}-%{version}.tar.gz
-# Source0-md5:	412ed4db5d2db04285799c4303ddeeed
-Source1:	%{name}.init
-Source2:	%{name}Dispatcher.init
+Group:		Applications
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/%{name}-%{version}.tar.bz2
+# Source0-md5:	64f780e7f95c252eaaed0201c3d9a4ca
+Source1:	%{name}-system-settings.conf
 Patch0:		%{name}-pld.patch
-BuildRequires:	GConf2-devel >= 2.20.0
+BuildRequires:	PolicyKit-devel
 BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	dbus-glib-devel >= 0.75
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-keyring-devel >= 2.20.0
-BuildRequires:	gtk+2-devel >= 2:2.12.0
-BuildRequires:	hal-devel >= 0.5.9
-BuildRequires:	intltool >= 0.36.0
-BuildRequires:	libgcrypt-devel
-BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.20.0
-BuildRequires:	libiw-devel >= 1:28
-BuildRequires:	libnl-devel >= 1:1.1
+BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	gtk-doc-automake
+BuildRequires:	hal-devel >= 0.5.2
+BuildRequires:	intltool >= 0.35.5
+BuildRequires:	libiw-devel >= 1:28-0.pre9.1
+BuildRequires:	libnl-devel >= 1:1.0-0.pre8.1
 BuildRequires:	libtool
+BuildRequires:	libuuid-devel
+BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
-BuildRequires:	readline-devel
+BuildRequires:	ppp-plugin-devel
 BuildRequires:	rpmbuild(macros) >= 1.450
+BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	dhcdbd
-Requires:	libnl >= 1:1.1
+Requires:	PolicyKit
 Requires:	rc-scripts
-Requires:	wpa_supplicant
+Requires:	wpa_supplicant >= 0.6-2
+Obsoletes:	dhcdbd < 3.0-1
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libexecdir	%{_libdir}/%{name}
+
 %description
 Network Manager for GNOME.
 
 %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
-Group:		X11/Libraries
+Group:		Libraries
 Conflicts:	NetworkManager < 0.6.4-0.2
 
 %description libs
@@ -63,10 +76,9 @@
 %package devel
 Summary:	Network Manager includes and more
 Summary(pl.UTF-8):	Pliki nagłówkowe Network Managera
-Group:		X11/Development/Libraries
+Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-glib-devel >= 0.72
-Requires:	libgcrypt-devel
 
 %description devel
 Network Manager includes and more.
@@ -77,7 +89,7 @@
 %package static
 Summary:	Network Manager static libraries
 Summary(pl.UTF-8):	Statyczne biblioteki Network Managera
-Group:		X11/Development/Libraries
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -91,7 +103,6 @@
 %patch0 -p1
 
 %build
-%{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
@@ -99,28 +110,27 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	--with-html-dir=%{_gtkdocdir} \
 	--with-distro=pld \
-	--without-gnome \
-	--with-dhcdbd=%{_sbindir}/dhcdbd \
-	--with-wpa_supplicant=%{_sbindir}/wpa_supplicant
+	--with-system-ca-path=/etc/certs
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{_sysconfdir}/%{name}/dispatcher.d}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{_sysconfdir}/%{name}/{VPN,dispatcher.d}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_bindir}
-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
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/nm-system-settings.conf
 
+# Cleanup
+rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.{a,la}
 
 [ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
 	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+
 %find_lang %{name}
 
 %clean
@@ -128,64 +138,88 @@
 
 %post
 /sbin/chkconfig --add NetworkManager
-/sbin/chkconfig --add NetworkManagerDispatcher
 %service -n NetworkManager restart "NetworkManager daemon"
-%service -n NetworkManagerDispatcher restart "NetworkManagerDispatcher daemon"
 
 %preun
 if [ "$1" = "0" ]; then
 	%service NetworkManager stop
-	%service NetworkManagerDispatcher stop
 	/sbin/chkconfig --del NetworkManager
-	/sbin/chkconfig --del NetworkManagerDispatcher
 fi
 
+%triggerun -- NetworkManager < 0.7.0-0.svn4027.1
+%service -q NetworkManagerDispatcher stop
+/sbin/chkconfig --del NetworkManagerDispatcher
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-#%attr(755,root,root) %{_bindir}/nm-vpn-properties
 %attr(755,root,root) %{_bindir}/nm-tool
 %attr(755,root,root) %{_sbindir}/NetworkManager
-%attr(755,root,root) %{_sbindir}/NetworkManagerDispatcher
-%attr(755,root,root) %{_libdir}/nm-crash-logger
+%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-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/VPN
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
+%dir %{_sysconfdir}/NetworkManager/system-connections
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/NetworkManager/nm-system-settings.conf
 %dir %{_datadir}/%{name}
 %dir /var/run/%{name}
-#%{_datadir}/gnome-vpn-properties
+%{_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
+%{_gtkdocdir}/libnm-util
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnm-util.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnm-util.so.0
 %attr(755,root,root) %{_libdir}/libnm_glib.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnm_glib.so.0
+%attr(755,root,root) %{_libdir}/libnm_glib_vpn.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnm_glib_vpn.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnm-util.so
 %attr(755,root,root) %{_libdir}/libnm_glib.so
+%attr(755,root,root) %{_libdir}/libnm_glib_vpn.so
 %{_libdir}/libnm-util.la
 %{_libdir}/libnm_glib.la
+%{_libdir}/libnm_glib_vpn.la
 %{_includedir}/NetworkManager
+%{_includedir}/libnm-glib
 %{_pkgconfigdir}/NetworkManager.pc
 %{_pkgconfigdir}/libnm-util.pc
+%{_pkgconfigdir}/libnm_glib_vpn.pc
 %{_pkgconfigdir}/libnm_glib.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libnm-util.a
 %{_libdir}/libnm_glib.a
+%{_libdir}/libnm_glib_vpn.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -193,10 +227,42 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2008/11/27 16:49:22  megabajt
+- merged from DEVEL
+- release 1 (works for me)
+
+Revision 1.39.2.13  2008/11/27 15:21:57  megabajt
+- updated to 0.7.0 (not tested)
+- trigger to delete NetworkManagerDispatcher service on upgrade
+- release 0.1
+
 Revision 1.46  2008/11/20 17:02:15  spider
 - missing br, readline-devel
 - adapterized
 
+Revision 1.39.2.12  2008/11/03 23:25:09  patrys
+- use keyfile by default
+- rel 2
+
+Revision 1.39.2.11  2008/09/13 10:56:01  cactus
+- BR: gtk-doc-automake libuuid-devel nss-devel
+
+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
+
+Revision 1.39.2.8  2008/08/29 17:42:35  glen
+- remove -Werror, adapter
+
+Revision 1.39.2.7  2008/05/12 16:11:27  glen
+- <= causes pain, use just <
+
+Revision 1.39.2.6  2008-05-12 15:24:51  patrys
+- O: dhcdbd as of 0.7
+
 Revision 1.45  2008/05/05 13:58:22  glen
 - do not restart NM on upgrade; rel 4
 
@@ -206,18 +272,34 @@
 Revision 1.43  2008-04-23 11:27:40  glen
 - drop gnome deps
 
-Revision 1.42  2008-03-07 16:13:18  megabajt
+Revision 1.39.2.5  2008-04-22 22:03:44  patrys
+- refetch
+
+Revision 1.39.2.4  2008-04-22 21:59:44  patrys
+- r3588
+
+Revision 1.42  2008/03/07 16:13:18  megabajt
 - updated to 0.6.6
 - removed -branch.diff
 
 Revision 1.41  2008-02-17 00:13:25  tommat
 - typo
 
-Revision 1.40  2008-02-04 17:17:45  megabajt
+Revision 1.40  2008/02/04 17:17:45  megabajt
 - updated -branch.diff
 - removed applied upstream -deprecated.patch
 - ghost soname symlinks
 - release 6
+
+Revision 1.39.2.3  2007-12-25 23:46:55  megabajt
+- updated to snap from rev 3190
+
+Revision 1.39.2.2  2007-11-22 17:44:54  megabajt
+- own %{_sysconfdir}/NetworkManager/VPN
+
+Revision 1.39.2.1  2007-11-21 19:24:37  megabajt
+- start playing with NetworkManager 0.7 (rev3104)
+- updated deps
 
 Revision 1.39  2007-11-12 19:40:46  dzeus
 - rel++
================================================================

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

More information about the pld-cvs-commit mailing list