rpms/scim-tomoe/FC-4 scim-tomoe-moduledir.patch, NONE, 1.1 scim-tomoe.spec, 1.2, 1.3

Ryo Dairiki (ryo) fedora-extras-commits at redhat.com
Wed Mar 1 05:51:29 UTC 2006


Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361

Modified Files:
	scim-tomoe.spec 
Added Files:
	scim-tomoe-moduledir.patch 
Log Message:


scim-tomoe-moduledir.patch:

--- NEW FILE scim-tomoe-moduledir.patch ---
--- src/Makefile.am	2006-03-01 14:35:56.000000000 +0900
+++ src/Makefile.am.new	2006-03-01 14:36:07.000000000 +0900
@@ -12,7 +12,7 @@
 	scim_tomoe_prefs.h \
 	scim_tomoe_prefs_win.h
 
-moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper
+moduledir = @SCIM_MODULEDIR@/Helper
 module_LTLIBRARIES = tomoe.la
 
 tomoe_la_SOURCES = \
--- src/Makefile.in	2006-03-01 14:44:48.000000000 +0900
+++ src/Makefile.in.new	2006-03-01 14:45:30.000000000 +0900
@@ -257,7 +257,7 @@
 	scim_tomoe_prefs.h \
 	scim_tomoe_prefs_win.h
 
-moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper
+moduledir = @SCIM_MODULEDIR@/Helper
 module_LTLIBRARIES = tomoe.la
 tomoe_la_SOURCES = \
 	scim_tomoe.cpp \


Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/scim-tomoe.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-tomoe.spec	7 Oct 2005 09:53:41 -0000	1.2
+++ scim-tomoe.spec	1 Mar 2006 05:51:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scim-tomoe
-Version:        0.1.0
-Release:        2%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -9,6 +9,8 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: scim-tomoe-moduledir.patch
+
 Requires:		scim
 BuildRequires:	scim-devel, tomoe-devel
 
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -29,7 +32,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/Helper/tomoe.la
 
 %find_lang %{name}
 
@@ -40,12 +43,15 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog
-%{_libdir}/scim-1.0
+%doc AUTHORS COPYING ChangeLog README
+%{_libdir}/scim-1.0/*/Helper/tomoe.so
 %{_datadir}/scim/icons/scim-tomoe.png
 
 
 %changelog
+* Wed Mar  1 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2-1
+- update to 0.2
+
 * Fri Oct  7 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.1-2
 - add scim into the requirement
 




More information about the fedora-extras-commits mailing list