[kwebkitpart] Translations are not included in the kwebkitpart package (#905627)

Rex Dieter rdieter at fedoraproject.org
Wed Jan 30 02:17:16 UTC 2013


commit 6ac2b4f2fef95fbf3f77cc1370129a6f372f0de5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 29 20:17:07 2013 -0600

    Translations are not included in the kwebkitpart package (#905627)

 .gitignore       |    3 +--
 kwebkitpart.spec |   20 ++++++++++++--------
 sources          |    2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0842c6f..987c5ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kwebkitpart-1.3.0.tar.xz
-/kwebkitpart-1.3.1.tar.xz
+/kwebkitpart-1.3.1.tar.bz2
diff --git a/kwebkitpart.spec b/kwebkitpart.spec
index 26843f4..6ce267b 100644
--- a/kwebkitpart.spec
+++ b/kwebkitpart.spec
@@ -2,18 +2,19 @@
 Name:    kwebkitpart
 Summary: A KPart based on QtWebKit
 Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 URL:     https://projects.kde.org/projects/extragear/base/kwebkitpart
-# git clone git://anongit.kde.org/kwebkitpart
-# git archive --prefix=kwebkitpart-%{version}/ v1.3.1 | xz > ../kwebkitpart-%{version}.tar.xz
-Source0: kwebkitpart-%{version}.tar.xz
+# use releaseme script to generate
+Source0: kwebkitpart-%{version}.tar.bz2
 
 ## upstream patches
-
-BuildRequires: gettext
+#define git_patches 1
+%if 0%{?git_patches}
 BuildRequires: git-core
+%endif
+BuildRequires: gettext
 BuildRequires: kdelibs4-devel >= 4.8.3
 BuildRequires: pkgconfig(QtWebKit)
 
@@ -31,7 +32,7 @@ browsing the web in Konqueror.
 %prep
 %setup -q
 
-%if 0
+%if 0%{?git_patches}
 git init
 if [ -z "$GIT_COMMITTER_NAME" ]; then
 git config user.email "kde at lists.fedoraproject.org"
@@ -44,7 +45,7 @@ git commit -a -q -m "%{version} baseline."
 git am -p1 %{patches} < /dev/null
 %endif
 
-%if 0%{?fedora} < 18
+%if 0%{?fedora} && 0%{?fedora} < 18
 # revert commit that gives kwebkitpart higher priority than khtml
 # https://projects.kde.org/projects/extragear/base/kwebkitpart/repository/revisions/49ea6284cc46e8a24d04a564d4c8680ebd2b0f74
 sed -i.InitialPreference \
@@ -86,6 +87,9 @@ fi
 
 
 %changelog
+* Tue Jan 29 2013 Rex Dieter <rdieter at fedoraproject.org> 1.3.1-2
+- Translations are not included in the kwebkitpart package (#905627)
+
 * Thu Jan 03 2013 Rex Dieter <rdieter at fedoraproject.org> 1.3.1-1
 - 1.3.1
 
diff --git a/sources b/sources
index 05e5f77..137484b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f941fb9cbcadb02bac18059a1741dc8c  kwebkitpart-1.3.1.tar.xz
+0002530def41c62a6923790af1795b52  kwebkitpart-1.3.1.tar.bz2


More information about the scm-commits mailing list