jreznik pushed to kdelibs3 (epel7). "drop branding hack which breaks kde-config --kde-version (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 2 15:39:09 UTC 2015


>From 2d08dc9c973cc39710c1eaf697978b1c549db221 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat, 9 Mar 2013 16:00:59 +0100
Subject: drop branding hack which breaks kde-config --kde-version

* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-50
- drop branding hack which breaks kde-config --kde-version

diff --git a/kdelibs3.spec b/kdelibs3.spec
index 9599e56..1e5a0d3 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -2,12 +2,6 @@
 
 %define _default_patch_fuzz 2
 
-%define distname "Fedora"
-
-%if 0%{?rhel}
-%define distname "EL"
-%endif
-
 %define arts_ev 8:1.5.10
 %define qt3 qt3
 %define qt3_version 3.3.8b
@@ -21,7 +15,7 @@
 Summary: KDE 3 Libraries
 Name:    kdelibs3
 Version: 3.5.10
-Release: 49%{?dist}
+Release: 50%{?dist}
 
 License: LGPLv2
 Url: http://www.kde.org/
@@ -256,8 +250,6 @@ format for easy browsing
 
 %patch150 -p1 -b .cups16
 
-sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
-
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
 %patch201 -p0 -b .cve-2009-1725
@@ -580,6 +572,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-50
+- drop branding hack which breaks kde-config --kde-version
+
 * Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-49
 - unify KDE 3 autotools fixes between packages
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=2d08dc9c973cc39710c1eaf697978b1c549db221


More information about the scm-commits mailing list