Hello community, here is the log from the commit of package NetworkManager-vpnc checked in at Tue Jun 5 18:25:52 CEST 2007. -------- --- NetworkManager-vpnc/NetworkManager-vpnc.changes 2007-05-15 10:33:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-vpnc/NetworkManager-vpnc.changes 2007-06-05 17:21:47.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Jun 5 17:21:29 CEST 2007 - sbrabec@suse.cz + +- Removed bogus definition of datadir. +- Fixed invalid desktop file patch. +- Fixed mixing of MIME and application icons. +- Call ldconfig. +- Fixed libexecdir. + +------------------------------------------------------------------- +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-cisco-vpn-settings.png New: ---- NetworkManager-vpnc-nm-vpnc.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-vpnc.spec ++++++ --- /var/tmp/diff_new_pack.T15257/_old 2007-06-05 18:25:48.000000000 +0200 +++ /var/tmp/diff_new_pack.T15257/_new 2007-06-05 18:25:48.000000000 +0200 @@ -13,16 +13,14 @@ Name: NetworkManager-vpnc BuildRequires: NetworkManager-devel intltool libglade2-devel libgnomeui-devel perl-XML-Parser update-desktop-files ExcludeArch: s390 s390x -%define prefix /usr -%define sysconfdir /etc Summary: NetworkManager VPN Support for vpnc Version: 0.5.0cvs20060202 -Release: 109 +Release: 121 License: GNU General Public License (GPL) Group: Productivity/Networking/System URL: http://people.redhat.com/dcbw/NetworkManager/ Source0: %{name}-%{version}.tar.gz -Source1: gnome-mime-application-x-cisco-vpn-settings.png +Source1: NetworkManager-vpnc-nm-vpnc.png Patch0: nm-vpnc-0.6-branch.patch Patch1: nm-vpnc-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,56 +56,69 @@ %prep %setup -q %patch0 -p1 -%patch1 -p0 +%patch1 +cp -a %{S:1} nm-vpnc.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\ + --libexecdir=%{_prefix}/lib/%{name} +make %{?jobs:-j%jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %find_lang %{name} -rm $RPM_BUILD_ROOT%{prefix}/%_lib/libnm-vpnc-properties.la -rm $RPM_BUILD_ROOT%{prefix}/%_lib/libnm-vpnc-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-cisco-vpn-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-vpnc-properties.la $RPM_BUILD_ROOT%{_libdir}/libnm-vpnc-properties.so +# FIXME: There is no MIME type definition for application/x-openvpn-settings in %{_datadir}/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-cisco-vpn-settings.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes/ +cp nm-vpnc.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ +%suse_update_desktop_file nm-vpnc 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,0755) %doc README -%dir %{sysconfdir}/NetworkManager -%dir %{sysconfdir}/NetworkManager/VPN -%{sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name -%{sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf %{_bindir}/nm-vpnc-service %{_bindir}/nm-vpnc-service-vpnc-helper +# FIXME: Owned also by NetworkManager-openvpn. Probably move to NetworkManager: +%dir %{_sysconfdir}/NetworkManager/VPN +%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name +%{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf %files gnome %defattr(-,root,root,0755) -%{prefix}/%_lib/libnm-vpnc-properties.so* -%{prefix}/%_lib/nm-vpnc-auth-dialog -%dir %{prefix}/share/%{name}/ -%dir %{prefix}/share/%{name}/applications -%{prefix}/share/%{name}/applications/nm-vpnc.desktop -%dir %{prefix}/share/%{name}/gnome-vpn-properties -%dir %{prefix}/share/%{name}/gnome-vpn-properties/vpnc -%{prefix}/share/%{name}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade -%{prefix}/share/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png +%{_datadir}/applications/nm-vpnc.desktop +# FIXME: Owned also by NetworkManager-openvpn. Probably move to NetworkManager-gnome: +%{_datadir}/gnome-vpn-properties +%{_datadir}/icons/hicolor/*/*/*.png +%{_libdir}/libnm-vpnc-properties.so* +%{_prefix}/lib/%{name} %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. +- Fixed libexecdir. +* 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-vpnc-desktop.patch ++++++ --- /var/tmp/diff_new_pack.T15257/_old 2007-06-05 18:25:48.000000000 +0200 +++ /var/tmp/diff_new_pack.T15257/_new 2007-06-05 18:25:48.000000000 +0200 @@ -1,16 +1,11 @@ -diff -u -u -r1.3 nm-vpnc.desktop.in ---- nm-vpnc.desktop.in 19 Oct 2005 18:27:16 -0000 1.3 -+++ nm-vpnc.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 (vpnc) +--- nm-vpnc.desktop.in ++++ nm-vpnc.desktop.in +@@ -4,7 +4,7 @@ _GenericName=VPN Connection Manager (vpnc) -@@ -8,5 +9,5 @@ + _Comment=Add, Remove, and Edit VPN Connections + Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.vpnc --import-file %f +-Icon=gnome-mime-application-x-cisco-vpn-settings ++Icon=nm-vpnc Terminal=false Type=Application DocPath= --Categories=GNOME;Application;Network; -+Categories=GNOME;Application;Network;Monitor;Applet; - MimeType=application/x-cisco-vpn-settings ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org