Author: megabajt Date: Fri Mar 11 22:40:33 2011 GMT Module: packages Tag: DEVEL ---- Log message: - updated to 0.8.996 - removed obsolete -compile.patch - removed upstart.patch (merged with -pld.patch)
---- Files affected: packages/NetworkManager: NetworkManager.spec (1.76 -> 1.76.2.1) ---- Diffs: ================================================================ Index: packages/NetworkManager/NetworkManager.spec diff -u packages/NetworkManager/NetworkManager.spec:1.76 packages/NetworkManager/NetworkManager.spec:1.76.2.1 --- packages/NetworkManager/NetworkManager.spec:1.76 Wed Feb 2 18:52:40 2011 +++ packages/NetworkManager/NetworkManager.spec Fri Mar 11 23:40:28 2011 @@ -3,16 +3,14 @@ Summary: Network Manager for GNOME Summary(pl.UTF-8): Zarządca sieci dla GNOME Name: NetworkManager -Version: 0.8.2 -Release: 4 +Version: 0.8.996 +Release: 1 License: GPL v2+ Group: Networking/Admin Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{version}.tar.bz2 # Source0-md5: 951158258544f761d9c09c052a7072e2 Source1: %{name}.conf Patch0: %{name}-pld.patch -Patch1: %{name}-compile.patch -Patch2: upstart.patch URL: http://projects.gnome.org/NetworkManager/ BuildRequires: autoconf >= 2.52 BuildRequires: automake >= 1:1.9 @@ -20,7 +18,8 @@ BuildRequires: dbus-glib-devel >= 0.75 BuildRequires: docbook-dtd412-xml BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.18.0 +BuildRequires: glib2-devel >= 1:2.24.0 +BuildRequires: gobject-introspection-devel >= 0.10.0 BuildRequires: gtk-doc BuildRequires: gtk-doc-automake >= 1.0 BuildRequires: intltool >= 0.35.5 @@ -37,8 +36,10 @@ BuildRequires: sed >= 4.0 BuildRequires: udev-devel BuildRequires: udev-glib-devel +BuildRequires: wimax-devel >= 1.5.1 Requires(post,preun): /sbin/chkconfig Requires: %{name}-libs = %{version}-%{release} +Requires: ConsoleKit Requires: dhcp-client Requires: filesystem >= 3.0-37 Requires: polkit @@ -76,7 +77,7 @@ Summary(pl.UTF-8): Biblioteki dzielone Network Managera Group: Libraries Requires: dbus-glib >= 0.75 -Requires: glib2 >= 1:2.18.0 +Requires: glib2 >= 1:2.24.0 Conflicts: NetworkManager < 0.6.4-0.2 %description libs @@ -91,7 +92,7 @@ Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: dbus-glib-devel >= 0.75 -Requires: glib2-devel >= 1:2.18.0 +Requires: glib2-devel >= 1:2.24.0 Requires: libuuid-devel Requires: udev-glib-devel @@ -116,8 +117,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %{__intltoolize} @@ -127,6 +126,7 @@ %{__autoheader} %{__automake} %configure \ + --disable-silent-rules \ --with-html-dir=%{_gtkdocdir} \ --with-distro=pld \ --enable-more-warnings=yes \ @@ -149,6 +149,7 @@ cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name} # Cleanup +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la} %{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/%{ppp_version}/*.{a,la} @@ -182,11 +183,11 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO +%attr(755,root,root) %{_bindir}/nm-online %attr(755,root,root) %{_bindir}/nm-tool %attr(755,root,root) %{_bindir}/nmcli %attr(755,root,root) %{_sbindir}/NetworkManager %dir %{_libdir}/NetworkManager -%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-keyfile.so %attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so %attr(755,root,root) %{_libexecdir}/nm-avahi-autoipd.action %attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action @@ -198,7 +199,6 @@ %{_datadir}/%{name}/gdb-cmd %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy -%{_datadir}/polkit-1/actions/org.freedesktop.network-manager-settings.system.policy /lib/udev/rules.d/77-nm-olpc-mesh.rules %dir %{_sysconfdir}/%{name}/VPN %dir %{_sysconfdir}/%{name}/system-connections @@ -208,7 +208,8 @@ %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-ifcfg-rh.conf %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf -%dir /var/run/%{name} +%attr(700,root,root) %dir /var/run/%{name} +%attr(700,root,root) %dir /var/lib/%{name} %{_mandir}/man1/nm-online.1* %{_mandir}/man1/nm-tool.1* %{_mandir}/man1/nmcli.1* @@ -219,32 +220,34 @@ %files apidocs %defattr(644,root,root,755) +%{_gtkdocdir}/NetworkManager %{_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.1 +%attr(755,root,root) %ghost %{_libdir}/libnm-util.so.2 %attr(755,root,root) %{_libdir}/libnm-glib.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libnm-glib.so.2 +%attr(755,root,root) %ghost %{_libdir}/libnm-glib.so.3 %attr(755,root,root) %{_libdir}/libnm-glib-vpn.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libnm-glib-vpn.so.1 +%{_libdir}/girepository-1.0/NMClient-1.0.typelib +%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib %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 +%{_datadir}/gir-1.0/NMClient-1.0.gir +%{_datadir}/gir-1.0/NetworkManager-1.0.gir %files static %defattr(644,root,root,755) @@ -258,6 +261,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.76.2.1 2011/03/11 22:40:28 megabajt +- updated to 0.8.996 +- removed obsolete -compile.patch +- removed upstart.patch (merged with -pld.patch) + Revision 1.76 2011/02/02 17:52:40 sparky - BR: docbook-dtd412-xml, gtk-doc, rpm-pythonprov ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.76&r2=1.76.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
