Hello community, here is the log from the commit of package NetworkManager-openvpn checked in at Tue Jun 5 16:38:06 CEST 2007. -------- --- NetworkManager-openvpn/NetworkManager-openvpn.changes 2007-05-15 10:31:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-openvpn/NetworkManager-openvpn.changes 2007-06-05 15:54:40.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Jun 5 14:09:02 CEST 2007 - sbrabec@suse.cz + +- Removed bogus definition of datadir. +- Fixed invalid desktop file patch. +- Fixed mixing of MIME and application icons. +- Call ldconfig. + +------------------------------------------------------------------- Old: ---- gnome-mime-application-x-openvpn-settings.png New: ---- NetworkManager-openvpn-openvpn-settings.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-openvpn.spec ++++++ --- /var/tmp/diff_new_pack.T10195/_old 2007-06-05 16:35:23.000000000 +0200 +++ /var/tmp/diff_new_pack.T10195/_new 2007-06-05 16:35:23.000000000 +0200 @@ -13,19 +13,19 @@ Name: NetworkManager-openvpn BuildRequires: NetworkManager-devel intltool libglade2-devel libgnomeui-devel perl-XML-Parser update-desktop-files ExcludeArch: s390 s390x -%define prefix /usr -%define sysconfdir /etc +%define prefix %{_prefix} +%define sysconfdir %{_sysconfdir} Summary: NetworkManager VPN support for OpenVPN Version: 0.3.2cvs20060202 -Release: 107 +Release: 119 License: GNU General Public License (GPL) Group: Productivity/Networking/System URL: http://www.gnome.org/projects/NetworkManager Source0: %{name}-%{version}.tar.gz -Source1: gnome-mime-application-x-openvpn-settings.png -Patch0: nm-openvpn-desktop.patch +Source1: NetworkManager-openvpn-openvpn-settings.png Patch1: nm-openvpn-0.6-branch.patch Patch2: nm-openvpn-po-update.patch +Patch3: nm-openvpn-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: openvpn NetworkManager %{name}-frontend @@ -58,58 +58,62 @@ %prep %setup -q -%patch0 -p0 %patch1 -p1 %patch2 -p1 +%patch3 +cp -a %{S:1} openvpn-settings.png %build intltoolize --copy --force autoreconf -f -i -CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" \ -./configure --prefix=%{prefix} \ - --bindir=%{_bindir} \ - --libdir=%{prefix}/%_lib \ - --libexecdir=%{prefix}/%_lib \ - --sysconfdir=%{sysconfdir} \ - --includedir=%{_includedir} \ - --datadir=%{prefix}/share/%{name} -make +%configure\ + --disable-static +make %{?jobs:-j%jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %find_lang %{name} -rm $RPM_BUILD_ROOT%{prefix}/%_lib/libnm-openvpn-properties.la -rm $RPM_BUILD_ROOT%{prefix}/%_lib/libnm-openvpn-properties.a -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/48x48/apps -rm $RPM_BUILD_ROOT%{prefix}/share/%{name}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png -cp %{S:1} $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/48x48/apps/ +# No headers, no development files: +rm $RPM_BUILD_ROOT%{_libdir}/libnm-openvpn-properties.la $RPM_BUILD_ROOT%{_libdir}/libnm-openvpn-properties.so +# FIXME: There is no MIME type definition for application/x-openvpn-settings in /usr/share/mime/packages. +# Without it, MIME icon has no effect. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes +mv $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes/ +cp openvpn-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ +%suse_update_desktop_file nm-openvpn GNOME Network Monitor Applet %clean rm -rf $RPM_BUILD_ROOT +%post gnome +%run_ldconfig + +%postun gnome +%run_ldconfig + %files -f %{name}.lang %defattr(-,root,root,-) %doc README -%dir %{sysconfdir}/NetworkManager +%{_bindir}/nm-openvpn-service +%{_bindir}/nm-openvpn-service-openvpn-helper %dir %{sysconfdir}/NetworkManager/VPN %{sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf -%{_bindir}/nm-openvpn-service -%{_bindir}/nm-openvpn-service-openvpn-helper %files gnome %defattr(-,root,root,-) -%{prefix}/%_lib/libnm-openvpn-properties.so* -%{prefix}/%_lib/nm-openvpn-auth-dialog -%dir %{prefix}/share/%{name}/ -%dir %{prefix}/share/%{name}/applications -%{prefix}/share/%{name}/applications/nm-openvpn.desktop -%dir %{prefix}/share/%{name}/gnome-vpn-properties -%dir %{prefix}/share/%{name}/gnome-vpn-properties/openvpn -%{prefix}/share/%{name}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade -%{prefix}/share/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png +%{_libdir}/libnm-openvpn-properties.so.* +%{_libdir}/nm-openvpn-auth-dialog +%{_datadir}/applications/nm-openvpn.desktop +%{_datadir}/gnome-vpn-properties +%{_datadir}/icons/hicolor/*/*/*.png %changelog +* Tue Jun 05 2007 - sbrabec@suse.cz +- Removed bogus definition of datadir. +- Fixed invalid desktop file patch. +- Fixed mixing of MIME and application icons. +- Call ldconfig. * Tue May 15 2007 - pgajdos@suse.cz - removed gnome-icon-theme from BuildRequires [#247450] * Mon Mar 19 2007 - hschaa@suse.de ++++++ nm-openvpn-desktop.patch ++++++ --- /var/tmp/diff_new_pack.T10195/_old 2007-06-05 16:35:23.000000000 +0200 +++ /var/tmp/diff_new_pack.T10195/_new 2007-06-05 16:35:23.000000000 +0200 @@ -1,16 +1,11 @@ -diff -u -u -r1.3 nm-openvpn.desktop.in ---- nm-openvpn.desktop.in 19 Oct 2005 18:27:16 -0000 1.3 -+++ nm-openvpn.desktop.in 19 Oct 2005 19:55:02 -0000 -@@ -1,4 +1,5 @@ - [Desktop Entry] -+X-SuSE-translate=true - Encoding=UTF-8 - _Name=VPN Connection Manager (OpenVPN) +--- nm-openvpn.desktop.in ++++ nm-openvpn.desktop.in +@@ -4,7 +4,7 @@ _GenericName=VPN Connection Manager (OpenVPN) -@@ -8,5 +9,5 @@ + _Comment=Add, Remove, and Edit VPN Connections + Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.openvpn --import-file %f +-Icon=gnome-mime-application-x-openvpn-settings ++Icon=openvpn-settings Terminal=false Type=Application DocPath= --Categories=GNOME;Application;Network; -+Categories=GNOME;Application;Network;Monitor;Applet; - MimeType=application/x-openvpn-settings ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org