SPECS (DEVEL): NetworkManager.spec - updated to 0.7.0 (not tested) - trigge...

[megabajt]

Author: megabajt                     Date: Thu Nov 27 15:22:02 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated to 0.7.0 (not tested)
- trigger to delete NetworkManagerDispatcher service on upgrade
- release 0.1

---- Files affected:
SPECS:
   NetworkManager.spec (1.39.2.12 -> 1.39.2.13) 

---- Diffs:

================================================================
Index: SPECS/NetworkManager.spec
diff -u SPECS/NetworkManager.spec:1.39.2.12 SPECS/NetworkManager.spec:1.39.2.13
--- SPECS/NetworkManager.spec:1.39.2.12	Tue Nov  4 00:25:09 2008
+++ SPECS/NetworkManager.spec	Thu Nov 27 16:21:57 2008
@@ -2,31 +2,28 @@
 # TODO:
 # - add a working(!) pld backend... (it work's 4 me as it is now - czarny)
 #
-%define		rev svn4027
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
 Version:	0.7.0
-Release:	0.%{rev}.2
+Release:	0.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}.tar.gz
-# Source0-md5:	214567f13871e081365eea58bfe26077
+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:	PolicyKit-devel
 BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.74-2
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	dbus-glib-devel >= 0.75
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.10.0
-BuildRequires:	gnome-common
+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:	libselinux-devel
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	nss-devel
@@ -34,7 +31,6 @@
 BuildRequires:	ppp-plugin-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
-Requires(post):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	PolicyKit
@@ -68,7 +64,7 @@
 %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
@@ -80,7 +76,7 @@
 %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
 
@@ -93,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
@@ -104,18 +100,19 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
-	--with-distro=pld
+	--with-distro=pld \
+	--with-system-ca-path=/etc/certs
 %{__make}
 
 %install
@@ -125,8 +122,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install test/nm-tool $RPM_BUILD_ROOT%{_bindir}/nm-tool
-install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/nm-system-settings.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/nm-system-settings.conf
 
 # Cleanup
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.{a,la}
@@ -134,7 +130,8 @@
 
 [ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
 	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name} --with-gnome --all-name
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -149,6 +146,10 @@
 	/sbin/chkconfig --del NetworkManager
 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
 
@@ -164,7 +165,6 @@
 %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
 %dir %{_sysconfdir}/NetworkManager
@@ -189,6 +189,7 @@
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libnm-glib
+%{_gtkdocdir}/libnm-util
 
 %files libs
 %defattr(644,root,root,755)
@@ -226,6 +227,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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.39.2.12  2008/11/03 23:25:09  patrys
 - use keyfile by default
 - rel 2
================================================================

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