rpms/konq-plugins/F-9 .cvsignore, 1.3, 1.4 konq-plugins.spec, 1.5, 1.6 sources, 1.3, 1.4 konq-plugins-4.0.1-docsdir.patch, 1.1, NONE konq-plugins-4.0.2-cmakelists.patch, 1.1, NONE konq-plugins-4.0.3-searchbar-crash.patch, 1.2, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Aug 6 16:54:19 UTC 2008
- Previous message (by thread): rpms/merkaartor/devel .cvsignore, 1.3, 1.4 merkaartor.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/numpy/F-9 numpy.spec,1.22,1.23 sources,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/konq-plugins/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9702
Modified Files:
.cvsignore konq-plugins.spec sources
Removed Files:
konq-plugins-4.0.1-docsdir.patch
konq-plugins-4.0.2-cmakelists.patch
konq-plugins-4.0.3-searchbar-crash.patch
Log Message:
* Wed Aug 06 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.0-1
- 4.1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 9 Apr 2008 20:20:18 -0000 1.3
+++ .cvsignore 6 Aug 2008 16:53:48 -0000 1.4
@@ -1 +1 @@
-konq-plugins-4.0.3.tar.bz2
+konq-plugins-4.1.0.tar.bz2
Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/F-9/konq-plugins.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- konq-plugins.spec 4 May 2008 19:32:15 -0000 1.5
+++ konq-plugins.spec 6 Aug 2008 16:53:48 -0000 1.6
@@ -1,11 +1,12 @@
-# Review Request:
-# https://bugzilla.redhat.com/show_bug.cgi?id=438126
+# Review Request: http://bugzilla.redhat.com/438126
-%define svn_date 20080409
+%if 0%{?fedora} > 9
+%define akregator 1
+%endif
Name: konq-plugins
-Version: 4.0.3
-Release: 0.3.%{svn_date}svn%{?dist}
+Version: 4.1.0
+Release: 1%{?dist}
Summary: Additional plugins that interact with konqueror
Group: Applications/Internet
@@ -17,37 +18,26 @@
# Kevin Kofler enhanced the create_tarball.rb script from upstream to also
# support %{name}. This script also download the translations and docs
# To use it you will need the script itself and a config.ini in the same directory
-#
# http://repo.calcforge.org/f9/kde4-tarballs/create_tarball.rb
# http://repo.calcforge.org/f9/kde4-tarballs/config.ini
-#
# To create a new checkout use it with anonymous svn access
# ./create_tarball.rb -n
# At the prompt you have to enter "%{name}" (without brackets)
-
-Source0: %{name}-%{version}.tar.bz2
-# Fix CMakeLists.txt to be able to build without extragear parentdir
-Patch0: konq-plugins-4.0.2-cmakelists.patch
-# Install the documentation into the right subdir
-Patch1: konq-plugins-4.0.1-docsdir.patch
-# Revert (relevant parts of) http://websvn.kde.org/?view=rev&revision=794424
-# Fixes searchbar plugin crash (#445144)
-Patch2: konq-plugins-4.0.3-searchbar-crash.patch
+Source0: ftp://ftp.kde.org/pub/kde/stable/4.1.0/src/extragear/konq-plugins-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kde-filesystem >= 4
-BuildRequires: kdelibs4-devel >= 4
-BuildRequires: kdebase-devel >= 4
-BuildRequires: cmake
-BuildRequires: gettext
-BuildRequires: giflib-devel
-BuildRequires: pcre-devel
+BuildRequires: kdebase4-devel >= 4.1
+%{?akregator:BuildRequires: kdepim4-devel}
+BuildRequires: cmake
+BuildRequires: gettext
+BuildRequires: giflib-devel
+BuildRequires: pcre-devel
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdelibs >= 4
-Requires: oxygen-icon-theme
+Requires: kdebase4 >= 4.1
+
Requires(post): xdg-utils
Requires(postun): xdg-utils
@@ -67,12 +57,10 @@
To use the akregator plugin the package kdepim is needed.
+
%prep
%setup -q
-%patch0 -p1 -b .cmakelists
-%patch1 -p1 -b .docsdir
-%patch2 -p1 -b .searchbar-crash
%build
mkdir -p %{_target_platform}
@@ -85,24 +73,25 @@
%install
rm -rf %{buildroot}
-mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}
# locale
for locale in akregator_konqplugin autorefresh babelfish crashesplugin \
- dirfilterplugin domtreeviewer fsview imgalleryplugin khtmlsettingsplugin \
- konqsidebar_mediaplayer konqsidebar_metabar konqsidebar_news mf_konqplugin \
- minitoolsplugin rellinks searchbarplugin uachangerplugin validatorsplugin \
- webarchiver
+ desktop_extragear-base_konq-plugins 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
+ %find_lang $locale || echo "ERROR: $locale"
cat $locale.lang >> %{name}.lang
done
+
%clean
rm -rf %{buildroot}
+
%post
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
@@ -111,32 +100,32 @@
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc COPYING COPYING.DOC COPYING.LIB README
-%{_kde4_docdir}/HTML/en/konq-plugins/
-# FIXME/TODO: Check directory ownerships
+%doc konq-plugins/COPYING konq-plugins/COPYING.LIB konq-plugins/README
+%{_kde4_docdir}/HTML/en/*
%{_kde4_bindir}/fsview
%{_datadir}/config/translaterc
-%{_kde4_appsdir}/akregator/
+%{?akregator:%{_kde4_appsdir}/akregator/}
%{_kde4_appsdir}/dolphinpart/kpartplugins/
%{_kde4_appsdir}/domtreeviewer/
%{_kde4_appsdir}/fsview/
%{_kde4_appsdir}/imagerotation/
%{_kde4_appsdir}/khtml/kpartplugins/*
+%{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
%{_kde4_appsdir}/konqueror/kpartplugins/*
%{_kde4_appsdir}/microformat/
%{_kde4_appsdir}/webkitpart/kpartplugins/*
%{_kde4_datadir}/kde4/services/*
-%{_kde4_iconsdir}/hicolor/*/apps/fsview.png
-%{_kde4_iconsdir}/oxygen/*/actions/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_libdir}/kde4/*
-# FIXME: Is this the right place?
-%{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
+
%changelog
-* Sun May 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.3-0.3.20080409svn
-- fix searchbar plugin crash (#445144)
+* Wed Aug 06 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.0-1
+- 4.1.0
* Wed Apr 16 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.3-0.2.20080409svn
- rebuild because of corrupt PPC RPM causing signing failure (#442761)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Apr 2008 20:20:18 -0000 1.3
+++ sources 6 Aug 2008 16:53:48 -0000 1.4
@@ -1 +1 @@
-2fad6c8b905c02218a4025cd15a74727 konq-plugins-4.0.3.tar.bz2
+aac0727e541c0e53c0d821ea644d13fb konq-plugins-4.1.0.tar.bz2
--- konq-plugins-4.0.1-docsdir.patch DELETED ---
--- konq-plugins-4.0.2-cmakelists.patch DELETED ---
--- konq-plugins-4.0.3-searchbar-crash.patch DELETED ---
- Previous message (by thread): rpms/merkaartor/devel .cvsignore, 1.3, 1.4 merkaartor.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/numpy/F-9 numpy.spec,1.22,1.23 sources,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list