|
@@ -1,14 +1,14 @@
|
|
%define udev_scriptdir /lib/udev
|
|
%define udev_scriptdir /lib/udev
|
|
|
|
|
|
-%define dbus_version 1.4.14
|
|
+%define dbus_version 1.4.16
|
|
-%define dbus_glib_version 0.94
|
|
+%define dbus_glib_version 0.96
|
|
|
|
|
|
-%define gtk3_version 3.1.12
|
|
+%define gtk3_version 3.2.0
|
|
%define wireless_tools_version 29
|
|
%define wireless_tools_version 29
|
|
%define libnl_version 1.1
|
|
%define libnl_version 1.1
|
|
%define ppp_version 2.4.5
|
|
%define ppp_version 2.4.5
|
|
|
|
|
|
-%define applet_version 0.9.0
|
|
+%define applet_version 0.9.1.90
|
|
|
|
|
|
#define snapshot .git20090414
|
|
#define snapshot .git20090414
|
|
#define applet_snapshot %{nil}
|
|
#define applet_snapshot %{nil}
|
|
@@ -16,7 +16,7 @@
|
|
Name: NetworkManager
|
|
Name: NetworkManager
|
|
Summary: Network connection manager and user applications
|
|
Summary: Network connection manager and user applications
|
|
Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
|
|
Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
|
|
-Version: 0.9.0
|
|
+Version: 0.9.1.90
|
|
Release: 1%{?snapshot}%{?_dist_release}
|
|
Release: 1%{?snapshot}%{?_dist_release}
|
|
Group: System Environment/Base
|
|
Group: System Environment/Base
|
|
License: GPLv2+
|
|
License: GPLv2+
|
|
@@ -25,10 +25,11 @@ URL: http://www.gnome.org/projects/NetworkManager/
|
|
Source: %{name}-%{version}%{?snapshot}.tar.xz
|
|
Source: %{name}-%{version}%{?snapshot}.tar.xz
|
|
Source1: network-manager-applet-%{applet_version}%{?applet_snapshot}.tar.xz
|
|
Source1: network-manager-applet-%{applet_version}%{?applet_snapshot}.tar.xz
|
|
Source2: nm-system-settings.conf
|
|
Source2: nm-system-settings.conf
|
|
-Patch1: nm-applet-internal-buildfixes-nm090.patch
|
|
+
|
|
-Patch2: explain-dns1-dns2.patch
|
|
+Patch0: NetworkManager-0.9.1.90-git20111006.patch
|
|
-#Patch20: NetworkManager-0.8.4.0-git20110501.patch
|
|
+Patch1: nm-applet-internal-buildfixes-nm09190.patch
|
|
-#Patch30: network-manager-applet-0.8.4-git20110503.patch
|
|
+Patch2: explain-dns1-dns2.patch
|
|
|
|
+Patch3: nm-polkit-permissive.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
@@ -149,17 +150,38 @@ This package contains the header and pkg-config files for development applicatio
|
|
NetworkManager functionality from applications that use glib.
|
|
NetworkManager functionality from applications that use glib.
|
|
|
|
|
|
|
|
|
|
|
|
+%package gtk
|
|
|
|
+Summary: Private libraries for NetworkManager GUI support
|
|
|
|
+Group: Development/Libraries
|
|
|
|
+Requires: gtk3 >= %{gtk3_version}
|
|
|
|
+
|
|
|
|
+%description gtk
|
|
|
|
+This package contains private libraries to be used only by nm-applet and
|
|
|
|
+the GNOME Control Center.
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+%package gtk-devel
|
|
|
|
+Summary: Private header files for NetworkManager GUI support
|
|
|
|
+Group: Development/Libraries
|
|
|
|
+Requires: %{name}-devel = %{version}-%{release}
|
|
|
|
+Requires: %{name}-glib = %{version}-%{release}
|
|
|
|
+Requires: gtk3-devel
|
|
|
|
+Requires: pkgconfig
|
|
|
|
+
|
|
|
|
+%description gtk-devel
|
|
|
|
+This package contains private header and pkg-config files to be used only by
|
|
|
|
+nm-applet and the GNOME control center.
|
|
|
|
+
|
|
|
|
+
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
|
|
|
|
# unpack the applet
|
|
# unpack the applet
|
|
xz -dc %{SOURCE1} | tar xf -
|
|
xz -dc %{SOURCE1} | tar xf -
|
|
|
|
+%patch0 -p1 -b .NM-git
|
|
%patch1 -p1 -b .nm-applet-internal
|
|
%patch1 -p1 -b .nm-applet-internal
|
|
-#%patch2 -p1 -b .explain-dns1-dns2
|
|
+%patch2 -p1 -b .explain-dns1-dns2
|
|
-#%patch20 -p1 -b .NM-git20110501
|
|
+%patch3 -p1 -b .polkit-permissive
|
|
-#pushd network-manager-applet-%{applet_version}
|
|
|
|
-#%patch30 -p1 -b .nma-git20110501
|
|
|
|
-#popd
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
@@ -358,7 +380,29 @@ fi
|
|
%dir %{_datadir}/gtk-doc/html/libnm-util
|
|
%dir %{_datadir}/gtk-doc/html/libnm-util
|
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
|
|
|
|
|
|
|
+%files gtk
|
|
|
|
+%defattr(-,root,root,0755)
|
|
|
|
+%{_libdir}/libnm-gtk.so.*
|
|
|
|
+%dir %{_datadir}/libnm-gtk
|
|
|
|
+%{_datadir}/libnm-gtk/*.ui
|
|
|
|
+
|
|
|
|
+%files gtk-devel
|
|
|
|
+%defattr(-,root,root,0755)
|
|
|
|
+%dir %{_includedir}/libnm-gtk
|
|
|
|
+%{_includedir}/libnm-gtk/*.h
|
|
|
|
+%{_libdir}/pkgconfig/libnm-gtk.pc
|
|
|
|
+%{_libdir}/libnm-gtk.so
|
|
|
|
+
|
|
|
|
+
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Oct 09 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.1.90-1
|
|
|
|
+- update to 0.9.1.90
|
|
|
|
+- update Patch1 (nm-applet-internal-buildfixes-nm09190.patch)
|
|
|
|
+- add Patch0 (NetworkManager-0.9.1.90-git20111006.patch)
|
|
|
|
+- add Patch2 (explain-dns1-dns2.patch)
|
|
|
|
+- add Patch3 (nm-polkit-permissive.patch)
|
|
|
|
+- create %%{name}-gtk and %%{name}-gtk-devel sub packages
|
|
|
|
+
|
|
* Tue Aug 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.0-1
|
|
* Tue Aug 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.0-1
|
|
- update to 0.9.0
|
|
- update to 0.9.0
|
|
- update Patch1 (nm-applet-internal-buildfixes-nm090.patch)
|
|
- update Patch1 (nm-applet-internal-buildfixes-nm090.patch)
|