[scim-chewing] Resolves:rh#914507 - scim-chewing: FTBFS in rawhide

paragn paragn at fedoraproject.org
Thu Feb 28 04:19:55 UTC 2013


commit 65835700beaa8f575d28797ea6c38bc8192873fd
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Thu Feb 28 09:51:34 2013 +0530

    Resolves:rh#914507 - scim-chewing: FTBFS in rawhide

 ...ng-0.3.4-fix-chewing-version-in-configure.patch |   11 +++++
 scim-chewing.spec                                  |   40 +++----------------
 2 files changed, 18 insertions(+), 33 deletions(-)
---
diff --git a/scim-chewing-0.3.4-fix-chewing-version-in-configure.patch b/scim-chewing-0.3.4-fix-chewing-version-in-configure.patch
new file mode 100644
index 0000000..fd63dc6
--- /dev/null
+++ b/scim-chewing-0.3.4-fix-chewing-version-in-configure.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2011-02-27 18:23:33.000000000 +0530
++++ configure	2013-02-27 18:45:44.303603593 +0530
+@@ -18585,7 +18585,7 @@
+ # Checks for libraries.
+ 
+ SCIM_VERSION=1.0.0
+-CHEWING_VERSION=0.3.3
++CHEWING_VERSION=0.3.4
+ 
+ 
+ 
diff --git a/scim-chewing.spec b/scim-chewing.spec
index 2881d8a..ac492bb 100644
--- a/scim-chewing.spec
+++ b/scim-chewing.spec
@@ -1,27 +1,15 @@
 Name:           scim-chewing
 Version:        0.3.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Chewing Chinese input method for SCIM
 
 License:        GPLv2+
 Url:            http://chewing.csie.net/
 Group:          System Environment/Libraries
 Source:         http://chewing.csie.net/download/scim/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildRequires:  scim-devel, libchewing-devel >= 0.3.3, gettext, intltool >= 0.34
 Requires:       scim
-Obsoletes:      iiimf-le-xcin <= 0.1.10
-#Patch0:         scim-chewing-0.3.1-4.bz197556.patch
-#Patch1:         scim-chewing-0.3.1-5.bz206125.patch
-#Patch2:         scim-chewing-0.3.1-6.bz206112.patch
-#Patch3:         scim-chewing-0.3.1-8.bz206120.patch
-#Patch4:         scim-chewing-0.3.1-9.bz216581.patch
-#Patch5:         scim-chewing-0.3.1-10.bz237924.patch
-#Patch6:         scim-chewing-0.3.1-11.bz200694.patch
-#Patch7:         scim-chewing-0.3.1-13.gcc.patch
-#Patch8:         scim-chewing-0.3.1-14.bz228428.patch
-#Patch9:         scim-chewing-0.3.1-15.bz195416.patch
-#Patch10:         scim-chewing-0.3.1.901.buildFix.patch
+Patch0:         scim-chewing-0.3.4-fix-chewing-version-in-configure.patch
 
 %description
 This package provides Chewing Chinese input method for SCIM. 
@@ -29,17 +17,7 @@ This package provides Chewing Chinese input method for SCIM.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .0-bz197556
-#%patch1 -p1 -b .1-bz206125
-#%patch2 -p1 -b .2-bz206112
-#%patch3 -p1 -b .3-bz206120
-#%patch4 -p1 -b .4-bz216581
-#%patch5 -p1 -b .5-bz237924
-#%patch6 -p1 -b .6-bz200694
-#%patch7 -p1 -b .7-gcc
-#%patch8 -p1 -b .8-bz228428
-#%patch9 -p1 -b .9-bz195416
-#%patch10 -p1 -b .buildFix
+%patch0 -p0 -b .0-bz914507
 
 %build
 %configure --disable-static
@@ -47,20 +25,13 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la
 
 %find_lang %{name}
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%defattr(-, root, root)
 %doc README AUTHORS COPYING
 %{_libdir}/scim-1.0/*/SetupUI/chewing-imengine-setup.so
 %{_libdir}/scim-1.0/*/IMEngine/chewing.so
@@ -69,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 27 2013 Parag Nemade <pnemade AT fedoraproject DOT org> - 0.3.4-5
+- Resolves:rh#914507 - scim-chewing: FTBFS in rawhide
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list