|
@@ -8,7 +8,7 @@
|
|
%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.4.1
|
|
+%define applet_version 0.9.6.2
|
|
|
|
|
|
#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.4.0
|
|
+Version: 0.9.6.0
|
|
Release: 1%{?snapshot}%{?_dist_release}
|
|
Release: 1%{?snapshot}%{?_dist_release}
|
|
Group: System Environment/Base
|
|
Group: System Environment/Base
|
|
License: GPLv2+
|
|
License: GPLv2+
|
|
@@ -26,7 +26,7 @@ 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-nm0940.patch
|
|
+Patch1: nm-applet-internal-buildfixes-nm0960.patch
|
|
Patch2: explain-dns1-dns2.patch
|
|
Patch2: explain-dns1-dns2.patch
|
|
Patch3: nm-polkit-permissive.patch
|
|
Patch3: nm-polkit-permissive.patch
|
|
|
|
|
|
@@ -260,37 +260,24 @@ fi
|
|
%post glib -p /sbin/ldconfig
|
|
%post glib -p /sbin/ldconfig
|
|
%postun glib -p /sbin/ldconfig
|
|
%postun glib -p /sbin/ldconfig
|
|
|
|
|
|
-%pre gnome
|
|
|
|
-if [ "$1" -gt 1 ]; then
|
|
|
|
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
|
- if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
|
|
|
|
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
|
|
|
|
- fi
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-%preun gnome
|
|
|
|
-if [ "$1" -eq 0 ]; then
|
|
|
|
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
|
- if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
|
|
|
|
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
|
|
|
|
- fi
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
%post gnome
|
|
%post gnome
|
|
touch --no-create %{_datadir}/icons/hicolor
|
|
touch --no-create %{_datadir}/icons/hicolor
|
|
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
|
fi
|
|
fi
|
|
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
|
-if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
|
|
|
|
- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
|
|
|
|
-fi
|
|
|
|
|
|
|
|
%postun gnome
|
|
%postun gnome
|
|
touch --no-create %{_datadir}/icons/hicolor
|
|
touch --no-create %{_datadir}/icons/hicolor
|
|
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
|
fi
|
|
fi
|
|
|
|
+if [ $1 -eq 0 ]; then
|
|
|
|
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
|
+fi
|
|
|
|
+
|
|
|
|
+%posttrans gnome
|
|
|
|
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
|
+
|
|
|
|
|
|
%files -f %{name}.lang
|
|
%files -f %{name}.lang
|
|
%defattr(-,root,root,0755)
|
|
%defattr(-,root,root,0755)
|
|
@@ -341,12 +328,13 @@ fi
|
|
|
|
|
|
%files gnome
|
|
%files gnome
|
|
%defattr(-,root,root,0755)
|
|
%defattr(-,root,root,0755)
|
|
-#%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
|
|
|
|
-%{_sysconfdir}/gconf/schemas/nm-applet.schemas
|
|
|
|
%{_bindir}/nm-applet
|
|
%{_bindir}/nm-applet
|
|
%{_bindir}/nm-connection-editor
|
|
%{_bindir}/nm-connection-editor
|
|
|
|
+%{_libexecdir}/nm-applet-migration-tool
|
|
%{_datadir}/applications/*.desktop
|
|
%{_datadir}/applications/*.desktop
|
|
%{_datadir}/nm-applet/
|
|
%{_datadir}/nm-applet/
|
|
|
|
+%{_datadir}/GConf/gsettings/nm-applet.convert
|
|
|
|
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
|
|
%{_datadir}/icons/hicolor/16x16/apps/*.png
|
|
%{_datadir}/icons/hicolor/16x16/apps/*.png
|
|
%{_datadir}/icons/hicolor/22x22/apps/*.png
|
|
%{_datadir}/icons/hicolor/22x22/apps/*.png
|
|
%{_datadir}/icons/hicolor/32x32/apps/*.png
|
|
%{_datadir}/icons/hicolor/32x32/apps/*.png
|
|
@@ -393,6 +381,10 @@ fi
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Fri Aug 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.6.0-1
|
|
|
|
+- update to 0.9.6.0
|
|
|
|
+- update Patch1 (nm-applet-internal-buildfixes-nm0960.patch)
|
|
|
|
+
|
|
* Sun Apr 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.4.0-1
|
|
* Sun Apr 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.4.0-1
|
|
- update to 0.9.4.0
|
|
- update to 0.9.4.0
|
|
- update Patch1 (nm-applet-internal-buildfixes-nm0940.patch)
|
|
- update Patch1 (nm-applet-internal-buildfixes-nm0940.patch)
|