[konq-plugins] * Sat Mar 05 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.1-1 - update to 4.6.1, fixes file conf

[Kevin Kofler]

commit 78ce23f3ea04f302654776cbd7289bbe7f19cf77
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 5 18:20:47 2011 +0100

    * Sat Mar 05 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.1-1
    - update to 4.6.1, fixes file conflict with kde-l10n
    - drop upstreamed patches
    - use documentation from 4.4.0 because it's missing in 4.6.1
    - drop old commented-out translation-finding code
    - drop no longer needed BR webkitpart-devel, code uses abstract interfaces now

 .gitignore        |    1 +
 konq-plugins.spec |   64 +++++++++++++++++++---------------------------------
 sources           |    1 +
 3 files changed, 26 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a63ec50..fc7969c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 konq-plugins-4.4.0.tar.bz2
+/konq-plugins-4.6.1.tar.bz2
diff --git a/konq-plugins.spec b/konq-plugins.spec
index 849b964..367cce5 100644
--- a/konq-plugins.spec
+++ b/konq-plugins.spec
@@ -1,30 +1,26 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
+# The 4.6.1 tarball is missing all documentation, keep the old one for now.
+%global docversion 4.4.0
+
 Name:           konq-plugins
-Version:        4.4.0
-Release:        7%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/konq-plugins-%{version}.tar.bz2
+Source1:        ftp://ftp.kde.org/pub/kde/stable/%{docversion}/src/extragear/konq-plugins-%{docversion}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
-# http://websvn.kde.org/?view=revision&revision=1089030
-Patch100: konq-plugins-4.4.0-babelfish-kwebkitpart.patch
-Patch101: konq-plugins-4.4.0-qt47.patch
-# http://bugs.kde.org/234624
-Patch102: konq-plugins-4.4.0-kde234624.patch
-# http://websvn.kde.org/?revision=1185208&view=revision
-Patch103: konq-plugins-4.4.0-adblock-window-close-fix.patch
 
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: kdebase4-devel >= %{version}
 %if 0%{?fedora}
-BuildRequires: webkitpart-devel >= 0.0.5
 BuildRequires: libtidy-devel
 %endif
 
@@ -57,11 +53,11 @@ Some additional plugins that interact with konqueror
 
 
 %prep
-%setup -q
-%patch100 -p0 -b .babelfish-kwebkitpart
-%patch101 -p1 -b .qt47
-%patch102 -p1 -b .kdekde234624
-%patch103 -p1 -b .adblock-window-close
+%setup -q -a 1
+# use documentation from the old tarball
+mv -f %{name}-%{docversion}/doc* .
+tail -n 2 %{name}-%{docversion}/CMakeLists.txt >>CMakeLists.txt
+rm -rf %{name}-%{docversion}
 
 
 %build
@@ -78,32 +74,13 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 1
-%find_lang %{name} --all-name --with-kde
-%else
-# locale
-for locale in adblock akregator_konqplugin autorefresh babelfish crashesplugin \
-  dirfilterplugin domtreeviewer \
-  fsview imgalleryplugin khtmlsettingsplugin konqsidebar_mediaplayer \
-  konqsidebar_metabar mf_konqplugin minitoolsplugin rellinks searchbarplugin \
-  uachangerplugin validatorsplugin webarchiver
-do
-  echo "find locale for $locale"
-  %find_lang $locale || echo "ERROR: $locale"
-  cat $locale.lang >> %{name}.lang
-done
-
-HTML_DIR=$(kde4-config --expandvars --install html)
-if [ -d %{buildroot}${HTML_DIR} ]; then
-for lang_dir in %{buildroot}${HTML_DIR}/* ; do
-  if [ -d ${lang_dir} ]; then
-    lang=$(basename ${lang_dir})
-    echo "%lang(${lang}) ${HTML_DIR}/${lang}/%{name}/" >> %{name}.lang
-  fi
-done
-fi
+# don't install kwebkitpart stuff on RHEL
+%if !0%{?fedora}
+rm -rf %{buildroot}%{_kde4_appsdir}/kwebkitpart/
 %endif
 
+%find_lang %{name} --all-name --with-kde
+
 
 %clean
 rm -rf %{buildroot}
@@ -152,6 +129,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Sat Mar 05 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.1-1
+- update to 4.6.1, fixes file conflict with kde-l10n
+- drop upstreamed patches
+- use documentation from 4.4.0 because it's missing in 4.6.1
+- drop old commented-out translation-finding code
+- drop no longer needed BR webkitpart-devel, code uses abstract interfaces now
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 6d6eb9d..8207d18 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 7eb163f429adf035c1495d1cbb05d4d2  konq-plugins-4.4.0.tar.bz2
+38facbeb5627ff6affa0fa0d676d1d19  konq-plugins-4.6.1.tar.bz2