rpms/scim/devel .cvsignore, 1.27, 1.28 scim.spec, 1.142, 1.143 sources, 1.29, 1.30 scim-1.4.7-translation-update-431995.patch, 1.2, NONE ta.po, 1.1, NONE

Jens Petersen petersen at fedoraproject.org
Fri May 1 23:41:26 UTC 2009


Author: petersen

Update of /cvs/pkgs/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11329

Modified Files:
	.cvsignore scim.spec sources 
Removed Files:
	scim-1.4.7-translation-update-431995.patch ta.po 
Log Message:
- update to 1.4.9
- ta.po is now upstream and scim-1.4.7-translation-update-431995.patch
  no longer needed




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	27 Jan 2009 09:32:21 -0000	1.27
+++ .cvsignore	1 May 2009 23:40:55 -0000	1.28
@@ -1,2 +1,2 @@
 scim-icons-0.7.tar.gz
-scim-1.4.8.tar.gz
+scim-1.4.9.tar.gz


Index: scim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- scim.spec	25 Mar 2009 07:24:24 -0000	1.142
+++ scim.spec	1 May 2009 23:40:56 -0000	1.143
@@ -1,20 +1,16 @@
-#%%define snapdate 20060716
-%define snapshot 0%{?snapdate:1}
-
 Name:      scim
-Version:   1.4.8
-Release:   3%{?dist}
+Version:   1.4.9
+Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.scim-im.org/
-Source0:   http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
+Source0:   http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:   xinput-scim
 Source2:   scim-icons-0.7.tar.gz
 Source3:   scim-system-config
 Source4:   scim-system-global
-Source5:   ta.po
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel, libXt-devel
@@ -22,10 +18,6 @@ BuildRequires: gtk2-devel, libXt-devel
 Buildrequires: autoconf automake gettext libtool
 # for system ltdl
 Buildrequires: libtool-ltdl-devel
-%if %{snapshot}
-# for devel docs
-BuildRequires: doxygen
-%endif
 Requires:  %{name}-libs = %{version}-%{release}
 Requires:  imsettings, im-chooser
 Requires(post): %{_sbindir}/alternatives
@@ -43,7 +35,6 @@ Patch20:   scim-1.4.7-fix-fallback.patch
 Patch21:   scim-1.4.7-fix-capslock.patch
 Patch22:   scim-1.4.7-fix-gdm.patch
 Patch23:   scim-1.4.7-remove-help-frame.patch
-Patch24:   scim-1.4.7-translation-update-431995.patch
 Patch25:   scim-1.4.7-timeout.patch
 Patch26:   scim-1.4.7-trayicon.patch
 Patch27:   scim-1.4.7-menu-pos.patch
@@ -153,7 +144,7 @@ This package requires the SCIM packages 
 
 
 %prep
-%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -a2
+%setup -q -a2
 
 cp -p scim-icons/icons/*.png data/icons
 cp -p scim-icons/pixmaps/*.png data/pixmaps
@@ -164,9 +155,6 @@ cp -p %{SOURCE3} configs/config
 mv configs/global{,.orig} 
 cp -p %{SOURCE4} configs/global
 
-# Tamil translation
-cp -pi %{SOURCE5} po
-
 %patch7 -p1 -b .7-emacs-ccmode~
 %patch9 -p1 -b .9-icon-size~
 %patch11 -p1 -b .11-factory-menu~
@@ -178,7 +166,6 @@ cp -pi %{SOURCE5} po
 %patch21 -p1 -b .21-fix-capslock
 %patch22 -p1 -b .22-fix-gdm
 %patch23 -p1 -b .23-help-frame
-%patch24 -p1 -b .24-trans
 %patch25 -p1 -b .25-timeout
 %patch26 -p1 -b .26-trayicon
 %patch27 -p1 -b .27-menu-pos
@@ -188,7 +175,7 @@ cp -pi %{SOURCE5} po
 %patch31 -p1 -b .31-sysltdl
 %patch32 -E -p1 -b .fix-dlopen
 
-# patch17, patch24 touch configure.ac and Makefile.am
+# patch17 touches configure.ac and Makefile.am
 ./bootstrap
 
 
@@ -196,11 +183,6 @@ cp -pi %{SOURCE5} po
 %configure --disable-static --enable-ld-version-script
 make %{?_smp_mflags}
 
-%if %{snapshot}
-make -C docs html
-rm -f docs/html/Helvetica.ttf
-%endif
-
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -317,6 +299,11 @@ fi
 
 
 %changelog
+* Sat May  2 2009 Jens Petersen <petersen at redhat.com> - 1.4.9-1
+- update to 1.4.9
+- ta.po is now upstream and scim-1.4.7-translation-update-431995.patch
+  no longer needed
+
 * Wed Mar 25 2009 Huang Peng <phuang at redhat.com> - 1.4.8-3
 - Use lt_dlopenadvise to replace lt_dlopenext to fix bug 491841
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	27 Jan 2009 09:32:21 -0000	1.29
+++ sources	1 May 2009 23:40:56 -0000	1.30
@@ -1,2 +1,2 @@
 2308b7fc4a5f981d08c7f00c90a7291b  scim-icons-0.7.tar.gz
-c52da019d48df4ba44cbd01558203cc7  scim-1.4.8.tar.gz
+975ba34b01304ea8166ac8ea27aa9e88  scim-1.4.9.tar.gz


--- scim-1.4.7-translation-update-431995.patch DELETED ---


--- ta.po DELETED ---




More information about the fedora-extras-commits mailing list