SPECS (DEVEL): NetworkManager.spec - remove -Werror, adapter

glen glen at pld-linux.org
Fri Aug 29 19:42:40 CEST 2008


Author: glen                         Date: Fri Aug 29 17:42:40 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- remove -Werror, adapter

---- Files affected:
SPECS:
   NetworkManager.spec (1.39.2.7 -> 1.39.2.8) 

---- Diffs:

================================================================
Index: SPECS/NetworkManager.spec
diff -u SPECS/NetworkManager.spec:1.39.2.7 SPECS/NetworkManager.spec:1.39.2.8
--- SPECS/NetworkManager.spec:1.39.2.7	Mon May 12 18:11:27 2008
+++ SPECS/NetworkManager.spec	Fri Aug 29 19:42:35 2008
@@ -2,16 +2,16 @@
 # TODO:
 # - add a working(!) pld backend... (it work's 4 me as it is now - czarny)
 #
+%define		rev rev3588
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
 Version:	0.7
-%define		_rev rev3588
-Release:	0.%{_rev}.1
+Release:	0.%{rev}.2
 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:	%{name}-%{version}%{rev}.tar.bz2
 # Source0-md5:	98f1fffeb6e3bcfac5461a5b83cd9bfb
 Source1:	%{name}.init
 Source2:	%{name}Dispatcher.init
@@ -19,26 +19,27 @@
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.74-2
-BuildRequires:	glib2-devel >= 1:2.10.0
 BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.10.0
 BuildRequires:	gnome-common
 BuildRequires:	hal-devel >= 0.5.2
 BuildRequires:	intltool >= 0.35.5
 BuildRequires:	libiw-devel >= 1:28-0.pre9.1
-BuildRequires:	ppp-plugin-devel
 BuildRequires:	libnl-devel >= 1:1.0-0.pre8.1
 BuildRequires:	libselinux-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+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:	rc-scripts
 Requires:	wpa_supplicant >= 0.6-2
 # sr at Latn vs. sr at latin
-Conflicts:	glibc-misc < 6:2.7
 Obsoletes:	dhcdbd < 3.0-1
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_libdir}/%{name}
@@ -87,8 +88,11 @@
 Statyczne biblioteki Network Managera.
 
 %prep
-%setup -q -n %{name}-%{version}%{_rev}
+%setup -q -n %{name}-%{version}%{rev}
 %patch0 -p1
+%if "%{rev}" == "rev3588"
+%{__sed} -i -e 's,-Werror,,' configure.in
+%endif
 
 %build
 %{__glib_gettextize}
@@ -166,9 +170,9 @@
 %{_mandir}/man8/NetworkManager.8*
 %{_mandir}/man8/NetworkManagerDispatcher.8*
 %{_mandir}/man1/nm-tool.1*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
+%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-system-settings.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf
 
 %files libs
 %defattr(644,root,root,755)
@@ -205,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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 <
 
================================================================

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



More information about the pld-cvs-commit mailing list