[koffice-kivio] revert to stock 1.6.3 (no useful changes in the Trinity snapshot)

Kevin Kofler kkofler at fedoraproject.org
Sat Mar 9 15:33:35 UTC 2013 

commit 69e2f804440d6a2eadcd6b6b912db022b1fcb8f3
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 9 16:33:19 2013 +0100

    revert to stock 1.6.3 (no useful changes in the Trinity snapshot)
    
    * Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:1.6.3-38
    - revert to stock 1.6.3 (no useful changes in the Trinity snapshot)
    - unify KDE 3 autotools fixes between packages, fixes FTBFS (#914117)
    - clean up specfile
    
    The old Trinity snapshot had no useful changes, only changes to the autotools
    setup which broke the common patches I'm applying to all KDE 3 packages now,
    and newer Trinity snapshots are no longer usable against stock kdelibs3. As I
    was using post-release snapshot versioning, reverting requires only a Release
    bump and no Epoch bump. (The 3:1.6.3-38.trinity.20100511svn build failed, so
    38 is enough.)

 .gitignore                                         |    1 +
 ...ktop.patch => koffice-1.6.3-kivio-desktop.patch |    0
 ...y-kivio.patch => koffice-1.6.3-only-kivio.patch |    0
 ...ename-po.patch => koffice-1.6.3-rename-po.patch |    0
 koffice-kivio.spec                                 |   38 +++++++-------------
 sources                                            |    2 +-
 6 files changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a982d1f..7023bc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 kivio-translations-20100511.tar.bz2
 koffice-trinity-20100511.tar.bz2
+/koffice-1.6.3.tar.bz2
diff --git a/koffice-trinity-20100511-kivio-desktop.patch b/koffice-1.6.3-kivio-desktop.patch
similarity index 100%
rename from koffice-trinity-20100511-kivio-desktop.patch
rename to koffice-1.6.3-kivio-desktop.patch
diff --git a/koffice-trinity-20100511-only-kivio.patch b/koffice-1.6.3-only-kivio.patch
similarity index 100%
rename from koffice-trinity-20100511-only-kivio.patch
rename to koffice-1.6.3-only-kivio.patch
diff --git a/koffice-trinity-20100511-rename-po.patch b/koffice-1.6.3-rename-po.patch
similarity index 100%
rename from koffice-trinity-20100511-rename-po.patch
rename to koffice-1.6.3-rename-po.patch
diff --git a/koffice-kivio.spec b/koffice-kivio.spec
index a0bfb84..c206f33 100644
--- a/koffice-kivio.spec
+++ b/koffice-kivio.spec
@@ -1,23 +1,15 @@
 
-%define svn 20100511
-%define translations kivio-translations-%{svn}
+%global translations kivio-translations-20100511
 
 Name:           koffice-kivio
 Epoch:          3
 Version:        1.6.3
-Release:        38.trinity.%{svn}svn%{?dist}
+Release:        38%{?dist}
 Summary:        A flowcharting application
 
-Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.koffice.org/
-# svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice/
-# SVNDATE=20100511
-# svn export \
-# svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice/ \
-# koffice-trinity-${SVNDATE}
-# tar cjf koffice-trinity-${SVNDATE}.tar.bz2 koffice-trinity-${SVNDATE}
-Source0:        koffice-trinity-%{svn}.tar.bz2
+Source0:        koffice-%{version}.tar.bz2
 # collected from svn://anonsvn.kde.org/home/kde/branches/stable/l10n/
 # ./create_tarball_kivio.rb -n -a kivio
 Source1:        %{translations}.tar.bz2
@@ -25,14 +17,13 @@ Source1:        %{translations}.tar.bz2
 Source100:      create_tarball_kivio.rb
 # config file for the above script
 Source101:      config.ini
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # disable some nested subdirectories which are not needed for Kivio
-Patch0:         koffice-trinity-20100511-only-kivio.patch
+Patch0:         koffice-1.6.3-only-kivio.patch
 # rename koffice.po and kofficefilters.po because they conflict with KOffice 2
-Patch1:         koffice-trinity-20100511-rename-po.patch
+Patch1:         koffice-1.6.3-rename-po.patch
 # fix kivio.desktop to validate
-Patch2:         koffice-trinity-20100511-kivio-desktop.patch
+Patch2:         koffice-1.6.3-kivio-desktop.patch
 
 # build the translations standalone, using the KDE 4 CMake framework
 Patch50:        kivio-translations-20100511-standalone.patch
@@ -45,9 +36,10 @@ Patch301: kde3-automake-version.patch
 # fix build failure with automake 1.13: add the --add-missing flag
 Patch302: kde3-automake-add-missing.patch
 
-BuildRequires:  kdelibs3-devel
+# for kde-config --kde-version
+BuildRequires:  kdelibs3-devel >= 3.5.10-50
 # See http://bugzilla.redhat.com/244091
-%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.10) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kdelibs3_ver %(kde-config --kde-version 2>/dev/null || echo 3.5.10)
 BuildRequires:  automake libtool
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
@@ -95,7 +87,7 @@ License:        LGPLv2+
 
 
 %prep
-%setup -q -n koffice-trinity-%{svn} -a 1
+%setup -q -n koffice-%{version} -a 1
 %patch0 -p1 -b .only-kivio
 %patch1 -p1 -b .rename-po
 %patch2 -p1 -b .kivio-desktop
@@ -145,7 +137,6 @@ popd
 
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 pushd %{translations}
@@ -197,9 +188,6 @@ sort -u kivio.lang >kivio-unique.lang
 mv -f kivio-unique.lang kivio.lang
 
 
-%clean
-rm -rf %{buildroot}
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
@@ -217,7 +205,6 @@ update-desktop-database -q &> /dev/null ||:
 %postun libs -p /sbin/ldconfig
 
 %files -f kivio.lang
-%defattr(-,root,root,-)
 %doc kivio/AUTHORS kivio/LICENSE kivio/README README.koffice
 %doc kivio/CHANGELOG kivio/CHANGES
 %{_bindir}/kivio
@@ -233,14 +220,15 @@ update-desktop-database -q &> /dev/null ||:
 %{_datadir}/icons/hicolor/*/apps/kivio.png
 
 %files libs
-%defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/lib*.so.*
 
 
 %changelog
-* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:1.6.3-38.trinity.20100511svn
+* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:1.6.3-38
+- revert to stock 1.6.3 (no useful changes in the Trinity snapshot)
 - unify KDE 3 autotools fixes between packages, fixes FTBFS (#914117)
+- clean up specfile
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3:1.6.3-37.trinity.20100511svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 53d7a3a..878adde 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+386d388094734f9759977c3267098e30  koffice-1.6.3.tar.bz2
 96fe5dad99c95e56b8478d2922ab2157  kivio-translations-20100511.tar.bz2
-229db1d6699d0191c54f0129dbd8b1ba  koffice-trinity-20100511.tar.bz2

More information about the scm-commits mailing list