dvratil pushed to kf5-kpeople (f22). "Merge branch 'master' into f22"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 11 12:57:39 UTC 2015
From ceee1ea37d1ff8af3de7da21f030b655cb1fe20c Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Sat, 2 May 2015 14:47:30 +0200
Subject: Rebuilt for GCC 5 C++11 ABI change
diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index 59e3f10..ca02148 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 library for contact and people aggregation
License: LGPLv2+
@@ -101,6 +101,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 5.9.0-2
+- Rebuilt for GCC 5 C++11 ABI change
+
* Tue Apr 07 2015 Daniel Vrátil <dvratil at redhat.com> - 5.9.0-1
- KDE Frameworks 5.9.0
--
cgit v0.10.2
From 10cd83757ace250b69b8f0516a7e21a08b9e5ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Mon, 11 May 2015 11:10:17 +0200
Subject: KDE Frameworks 5.10.0
diff --git a/.gitignore b/.gitignore
index 2f2a512..86c18aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/kpeople-5.8.0.tar.xz
/kpeople-5.9.0.tar.xz
+/kpeople-5.10.0.tar.xz
diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index ca02148..16f9d6e 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -1,8 +1,8 @@
%global framework kpeople
Name: kf5-%{framework}
-Version: 5.9.0
-Release: 2%{?dist}
+Version: 5.10.0
+Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 3 library for contact and people aggregation
License: LGPLv2+
@@ -101,6 +101,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Mon May 11 2015 Daniel Vrátil <dvratil at redhat.com> - 5.10.0-1
+- KDE Frameworks 5.10.0
+
* Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 5.9.0-2
- Rebuilt for GCC 5 C++11 ABI change
diff --git a/sources b/sources
index d68773c..67c2779 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83fa36023102fe1e914509ec4a3f5fe4 kpeople-5.9.0.tar.xz
+eadbc8d6c7591882d143b2e90bd9be72 kpeople-5.10.0.tar.xz
--
cgit v0.10.2
From f4fd609ddc0397e13997cfa33774bb967aa38e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Mon, 11 May 2015 14:55:33 +0200
Subject: Remove upstreamed patch for avoiding catalog conflicts with
libkpeople
diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index 16f9d6e..89fb686 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -17,9 +17,6 @@ URL: https://projects.kde.org/projects/frameworks/kpeople
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
-# use non-conflicting libkpeople5 translation catalog
-Patch1: kpeople-catalog.patch
-
## Once ktp-kf5 stack is ready, can consider Obsoletes
#Obsoletes: libkpeople < 1.0
@@ -54,15 +51,6 @@ developing applications that use %{name}.
%prep
%setup -q -n %{framework}-%{version}
-%patch1 -p1 -b .catalog
-
-for po in po/*/libkpeople.po ; do
-pushd $(dirname $po)
-mv libkpeople.po libkpeople5.po
-popd
-done
-
-
%build
mkdir %{_target_platform}
pushd %{_target_platform}
diff --git a/kpeople-catalog.patch b/kpeople-catalog.patch
deleted file mode 100644
index 80180ca..0000000
--- a/kpeople-catalog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kpeople-5.8.0/CMakeLists.txt.catalog kpeople-5.8.0/CMakeLists.txt
---- kpeople-5.8.0/CMakeLists.txt.catalog 2015-03-13 03:07:30.000000000 -0500
-+++ kpeople-5.8.0/CMakeLists.txt 2015-04-07 16:42:40.806906451 -0500
-@@ -30,7 +30,7 @@ include(KDEInstallDirs)
- include(KDEFrameworkCompilerSettings)
- include(KDECMakeSettings)
-
--add_definitions(-DTRANSLATION_DOMAIN=\"libkpeople\")
-+add_definitions(-DTRANSLATION_DOMAIN=\"libkpeople5\")
-
- set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5People")
-
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kf5-kpeople.git/commit/?h=f22&id=bebad4fc33daf78166ed48cd432f785096862d62
More information about the scm-commits
mailing list