[kwebkitpart/f15] kwebkitpart 1.1 20110720 snapshot drop kwebkitpart-devel
nucleo
nucleo at fedoraproject.org
Mon Jul 25 14:22:33 UTC 2011
commit ed7b102825f331e59817dd671c2c805f69872eda
Author: nucleo <nucleo at fedoraproject.org>
Date: Mon Jul 25 17:22:21 2011 +0300
kwebkitpart 1.1 20110720 snapshot
drop kwebkitpart-devel
.gitignore | 1 +
kwebkitpart.spec | 47 ++++++++++++++++++++---------------------------
sources | 2 +-
3 files changed, 22 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f6a0f52..22c15dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/127960-kwebkitpart-0.9.6.tar.bz2
+/kwebkitpart-1.1-20110720.tar.bz2
diff --git a/kwebkitpart.spec b/kwebkitpart.spec
index 80e5e45..8dbbd93 100644
--- a/kwebkitpart.spec
+++ b/kwebkitpart.spec
@@ -1,17 +1,27 @@
+%define snap 20110720
+
Name: kwebkitpart
-Version: 0.9.6
-Release: 3%{?dist}
+Version: 1.1
+Release: 0.1.%{snap}%{?dist}
Summary: A KPart based on QtWebKit
Group: System Environment/Libraries
License: LGPLv2+
URL: http://kde-apps.org/content/show.php?content=127960
+%if 0%{?snap}
+# git clone git://anongit.kde.org/kwebkitpart
+# git archive --prefix=kwebkitpart-%{version}/ origin/%{version} | bzip2 > ../kwebkitpart-%{version}-%{snap}.tar.bz2
+Source0: kwebkitpart-%{version}-%{snap}.tar.bz2
+%else
+# Official release
Source0: http://kde-apps.org/CONTENT/content-files/127960-%{name}-%{version}.tar.bz2
+%endif
BuildRequires: gettext
BuildRequires: kdelibs4-devel >= 4.4.0
%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
+Obsoletes: kwebkitpart-devel < 1.1
Obsoletes: webkitpart < 0.0.6
Provides: webkitpart = %{version}-%{release}
@@ -21,21 +31,12 @@ based on (Qt)WebKit. You can use it for example for
browsing the web in Konqueror.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: kdelibs4-devel
-Requires: %{name} = %{version}-%{release}
-
-Obsoletes: webkitpart-devel < 0.0.6
-Provides: webkitpart-devel = %{version}-%{release}
-
-%description devel
-Development files for the %{name}.
-
%prep
%setup -q
+# FindKWebKitPart.cmake unintentionally left over from the v1.1 clean up
+sed -i "/add_subdirectory(cmake)/d" CMakeLists.txt
+
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
@@ -49,8 +50,6 @@ rm -rf $RPM_BUILD_ROOT
make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-%find_lang %{name}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -69,25 +68,19 @@ if [ $1 -eq 0 ] ; then
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
fi
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
%doc README COPYING.LIB TODO
%{_kde4_libdir}/kde4/kwebkitpart.so
-%{_kde4_libdir}/libkwebkit.so.*
%{_kde4_iconsdir}/hicolor/*/apps/webkit.png
%{_kde4_datadir}/kde4/services/%{name}.desktop
%{_kde4_appsdir}/%{name}
-%files devel
-%defattr(-,root,root,-)
-%doc README
-%{_kde4_includedir}/KDE/KWebKitPart
-%{_kde4_includedir}/kwebkitpart.h
-%{_kde4_includedir}/kwebkit_export.h
-%{_kde4_libdir}/libkwebkit.so
-%{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake
-
%changelog
+* Thu Jul 21 2011 Alexey Kurov <nucleo at fedoraproject.org> - 1.1-0.1.20110720
+- kwebkitpart 1.1 20110720 snapshot
+- drop kwebkitpart-devel
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 8aaff73..ab938e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-017b56eae5462617bf5fded092280e1f 127960-kwebkitpart-0.9.6.tar.bz2
+52e420049b4163fc7612d8a88033eda4 kwebkitpart-1.1-20110720.tar.bz2
More information about the scm-commits
mailing list