rpms/scim-bridge/devel scim-bridge-0.4.8-qt-moc-path.patch, NONE, 1.1 scim-bridge-0.4.8-tests-dir-missing.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 scim-bridge.spec, 1.36, 1.37 sources, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: petersen

Update of /cvs/dist/rpms/scim-bridge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5226

Modified Files:
	.cvsignore scim-bridge.spec sources 
Added Files:
	scim-bridge-0.4.8-qt-moc-path.patch 
	scim-bridge-0.4.8-tests-dir-missing.patch 
Log Message:
- update to 0.4.8
- add scim-bridge-0.4.8-qt-moc-path.patch to set full path to moc
  and  scim-bridge-0.4.8-tests-dir-missing.patch to allow rebootstrap


scim-bridge-0.4.8-qt-moc-path.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE scim-bridge-0.4.8-qt-moc-path.patch ---
diff -u scim-bridge-0.4.8/client-qt/Makefile.am~ scim-bridge-0.4.8/client-qt/Makefile.am
--- scim-bridge-0.4.8/client-qt/Makefile.am~	2006-11-23 14:55:05.000000000 +1000
+++ scim-bridge-0.4.8/client-qt/Makefile.am	2006-11-23 14:55:05.000000000 +1000
@@ -45,7 +45,7 @@
 im_scim_bridge_la_LIBADD  = $(top_srcdir)/common/libscimbridgecommon.la \
 							$(top_srcdir)/client-common/libscimbridgeclientcommon.la
 
-MOC = moc
+MOC = @QT3_PREFIX@/bin/moc
 
 CLEANFILES = moc_scim-bridge-client-qt.cpp
 

scim-bridge-0.4.8-tests-dir-missing.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE scim-bridge-0.4.8-tests-dir-missing.patch ---
diff -u scim-bridge-0.4.8/configure.ac~ scim-bridge-0.4.8/configure.ac
--- scim-bridge-0.4.8/configure.ac~	2006-11-23 15:04:43.000000000 +1000
+++ scim-bridge-0.4.8/configure.ac	2006-11-23 15:04:43.000000000 +1000
@@ -255,7 +255,7 @@
 if test "$enable_tests" = "yes"; then
   BUILD_DIR_TESTS=tests
   AC_SUBST(BUILD_DIR_TESTS)
-  AC_CONFIG_FILES([tests/Makefile])
+#  AC_CONFIG_FILES([tests/Makefile])
 fi
 if test "$enable_documents" = "yes"; then
   BUILD_DIR_DOCUMENTS=doc


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	23 Oct 2006 02:13:39 -0000	1.24
+++ .cvsignore	23 Nov 2006 05:22:37 -0000	1.25
@@ -1 +1 @@
-scim-bridge-0.4.7.tar.gz
+scim-bridge-0.4.8.tar.gz


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- scim-bridge.spec	23 Oct 2006 02:13:39 -0000	1.36
+++ scim-bridge.spec	23 Nov 2006 05:22:38 -0000	1.37
@@ -4,7 +4,7 @@
 %define build_qt 1
 
 Name:           scim-bridge
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
@@ -24,6 +24,10 @@
 %endif
 # for new xinput files (fc6)
 Requires:       scim >= 1.4.4-33
+Patch1:         scim-bridge-0.4.8-qt-moc-path.patch
+Buildrequires:  automake 
+Patch2:         scim-bridge-0.4.8-tests-dir-missing.patch
+Buildrequires:  autoconf
 
 %description
 SCIM Bridge is a C implementation of a Gtk IM module for SCIM.
@@ -60,6 +64,10 @@
 
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
+%patch1 -p1 -b .1-moc
+%patch2 -p1 -b .2-tests-missing
+mkdir m4
+autoreconf
 %if %{snapshot}
 ./bootstrap
 %endif
@@ -125,12 +133,17 @@
 
 
 %changelog
+* Thu Nov 23 2006 Jens Petersen <petersen at redhat.com> - 0.4.8-1
+- update to 0.4.8
+- add scim-bridge-0.4.8-qt-moc-path.patch to set full path to moc
+  and  scim-bridge-0.4.8-tests-dir-missing.patch to allow rebootstrap
+
 * Mon Oct 23 2006 Jens Petersen <petersen at redhat.com> - 0.4.7-1
 - update to 0.4.7 release
 - build qtimm again
 
 * Thu Oct 19 2006 Jens Petersen <petersen at redhat.com> - 0.4.6-1
-- as of 0.4.6 license is now both GPL and LGPL
+- as of 0.4.6 now dual GPL/LGPL license
 - update to latest cvs (fixes #208921, #209573)
 - scim-bridge-0.4.5-key-event-order-206261.patch no longer needed
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	23 Oct 2006 02:13:39 -0000	1.24
+++ sources	23 Nov 2006 05:22:38 -0000	1.25
@@ -1 +1 @@
-0d9364f0fd3d3e259cc434a1a6ee3574  scim-bridge-0.4.7.tar.gz
+dd31005d109a12d35e93b79fc8c67690  scim-bridge-0.4.8.tar.gz