Hello community,

here is the log from the commit of package kvpnc for openSUSE:Factory
checked in at Wed Jun 1 10:54:44 CEST 2011.



--------
--- KDE/kvpnc/kvpnc.changes     2010-03-09 09:41:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/kvpnc/kvpnc.changes    2011-05-25 
21:38:01.000000000 +0200
@@ -1,0 +2,17 @@
+Wed May 25 19:35:25 UTC 2011 - [email protected]
+
+- update to version 0.9.6a
+  * ping_check.sh install fixed.
+- Spec files updates:
+  * Changes based on spec-cleaner run.
+  * Removed gpgme-devel, kdebase4-workspace-devel, libkdepimlibs4-devel and
+    libqimageblitz-devel from BuildRequires (not needed) and added
+    libgcrypt-devel.
+  * Added some Recommended packages.
+  * Updates in Summary: and %description entries.
+  * Minor other updates.
+- Fixed rpmlint warnings "file-contains-date-and-time", "wrong-icon-size",
+  "non-executable-script" and "invalid-lc-messages-dir".
+- Removed kvpnc.rpmlintrc.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  kvpnc-0.9.6-kde4.tar.bz2
  kvpnc.rpmlintrc

New:
----
  kvpnc-0.9.6a-kde4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kvpnc.spec ++++++
--- /var/tmp/diff_new_pack.kzgZOE/_old  2011-06-01 10:52:16.000000000 +0200
+++ /var/tmp/diff_new_pack.kzgZOE/_new  2011-06-01 10:52:16.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package kvpnc (Version 0.9.6)
+# spec file for package kvpnc
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,67 +19,109 @@
 
 
 Name:           kvpnc
-BuildRequires:  kdebase4-workspace-devel libkde4-devel update-desktop-files
-BuildRequires:  fdupes gpgme-devel libkdepimlibs4-devel libqimageblitz-devel
-Url:            http://home.gna.org/kvpnc/
+Version:        0.9.6a
+Release:        1
 License:        GPLv2+
+Summary:        GUI Front-End for various VPN clients
+Url:            http://home.gna.org/kvpnc/
 Group:          Productivity/Networking/System
-Summary:        GUI Front-End for openswan and vpnc
-Version:        0.9.6
-Release:        1
+Source0:        http://download.gna.org/kvpnc/%{name}-%{version}-kde4.tar.bz2
+Source1:        http://download.gna.org/kvpnc/%{name}-0.9.6-kde4-locale.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         %{name}-%{version}-kde4.tar.bz2
-Source1:        kvpnc.rpmlintrc
-Source2:        %{name}-%{version}-kde4-locale.tar.bz2
-Requires:       kdebase4-workspace kdebase4-runtime
+# only needed to patch broken images in the upstream tarball
+BuildRequires:  ImageMagick
+BuildRequires:  fdupes
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libkde4-devel
+%if 0%{?suse_version}
+BuildRequires:  update-desktop-files
+%endif
+%kde4_runtime_requires
+Recommends:     ksshaskpass
+Recommends:     opensc
+Recommends:     openssl
 Provides:       kde4-kvpnc = %{version}
 Obsoletes:      kde4-kvpnc < %{version}
 
 %description
-The application can create configurations for various kinds of VPN
-connections. You should also install the vpnc or openswan package.
-
-
-
-Authors:
---------
-    Christoph Thielecke <[email protected]>
+The application can create configurations for various kinds of VPN connections.
+You should also install a vpn package (e.g. openvpn, strongswan, vpnc).
 
 %prep
-%setup -q -n %{name}-%{version}-kde4 -a2
+%setup -q -n %{name}-%{version}-kde4 -a1
 echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
 echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
 echo "add_subdirectory( po )" >> CMakeLists.txt
 
+# Remove build time references so build-compare can do its work
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e 
%%Y')
+sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/main.cpp
+sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/main.cpp
+sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/kvpncconfig.cpp
+
+# Patch image with wrong dimensions - Fixes rpmlint warning "wrong-icon-size"
+for d in src/icons src/icons/actions; do
+  pushd "$d"
+  for s in 16 22 32 48 64; do
+    ls *"$s"-*.png || break
+    for f in *"$s"-*.png *"$s"-*.png *"$s"-*.png *"$s"-*.png; do
+      geom=$(identify -ping "$f"|cut -f3 -d" ")
+      x=${geom%x*}
+      y=${geom#*x}
+      if [ "$x" != "$s" -o "$y" != "$s" ]; then
+        if [ "$x" -gt "$y" ]; then
+          nugeom="${x}x${x}"
+          grav=south
+        elif [ "$x" -lt "$y" ]; then
+          nugeom="${y}x${y}"
+          grav=center
+        else
+          nugeom=""
+        fi
+        [ -n "$nugeom" ] && mogrify -extent "$nugeom" -background transparent 
-gravity "$grav" "$f"
+        mogrify -scale "$s"x"$s" -background transparent "$f"
+      fi
+    done
+  done
+  popd
+done
+
 %build
 %cmake_kde4 -d build
 %make_jobs
 
 %install
 cd build
-%makeinstall
-%suse_update_desktop_file -G "VPNC FrontEnd" kvpnc Networking
-%fdupes %{buildroot}%{_datadir}
+%kde4_makeinstall
 cd ..
-rm -rf $RPM_BUILD_ROOT/usr/share/locale/x-test
-%find_lang %{name}
 
-%post -p /sbin/ldconfig
+# Fix permissions
+chmod 755 %{buildroot}%{_kde4_appsdir}/kvpnc/ping_check.sh
+
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "VPNC FrontEnd" kvpnc Qt KDE Network RemoteAccess
+%endif
+
+# Remove unneeded locales
+%if 0%{?suse_version} && 0%{?suse_version} < 1140
+rm -rf %{buildroot}%{_datadir}/locale/hne/
+rm -rf %{buildroot}%{_datadir}/locale/x-test/
+%endif
+
+%fdupes -s %{buildroot}%{_datadir}
 
-%postun -p /sbin/ldconfig
+%find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%if %suse_version < 1120
-%dir /usr/share/locale/hne
-%dir /usr/share/locale/hne/LC_MESSAGES
-%endif
-%{_datadir}/kde4/apps/kvpnc
-%{_bindir}/kvpnc
-%{_datadir}/applications/kde4
-%{_datadir}/icons/*
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog README TODO
+%{_kde4_bindir}/kvpnc
+%{_kde4_applicationsdir}/kvpnc.desktop
+%{_kde4_iconsdir}/*/*/*/*
+%{_kde4_appsdir}/kvpnc/
 
 %changelog

++++++ kvpnc-0.9.6-kde4.tar.bz2 -> kvpnc-0.9.6a-kde4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kvpnc-0.9.6-kde4/ChangeLog 
new/kvpnc-0.9.6a-kde4/ChangeLog
--- old/kvpnc-0.9.6-kde4/ChangeLog      2010-03-08 12:39:56.000000000 +0100
+++ new/kvpnc-0.9.6a-kde4/ChangeLog     2010-05-19 10:48:00.000000000 +0200
@@ -1,3 +1,6 @@
+2010-05-19 Christoph Thielecke <[email protected]>
+       ping_check.sh install fixed
+
 2010-03-08 Christoph Thielecke <[email protected]>
        selecting profile selects not right profile fixed
        split specific options at preferencesdialog in multiple tabs (*swan, 
racoon, pptp, openvpn) for reducing preferencesdialog size
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kvpnc-0.9.6-kde4/src/CMakeLists.txt 
new/kvpnc-0.9.6a-kde4/src/CMakeLists.txt
--- old/kvpnc-0.9.6-kde4/src/CMakeLists.txt     2009-11-14 23:08:39.000000000 
+0100
+++ new/kvpnc-0.9.6a-kde4/src/CMakeLists.txt    2010-05-19 10:47:21.000000000 
+0200
@@ -180,7 +180,7 @@
 
 target_link_libraries(kvpnc_bin ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} 
${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} 
${LIBGCRYPT_LIBRARIES} ${KDE4_KPTY_LIBS})
 
-install(FILES kvpnc.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kvpnc)
+install(FILES kvpnc.notifyrc ping_check.sh DESTINATION 
${DATA_INSTALL_DIR}/kvpnc)
 install(TARGETS kvpnc_bin ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES kvpncui.rc DESTINATION ${DATA_INSTALL_DIR}/kvpnc)
 install(FILES kvpnc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to