rpms/gcin/devel Makefile.patch, NONE, 1.1 configure.patch, NONE, 1.1 gcin.conf, NONE, 1.1 gcin.spec, NONE, 1.1 im-client.patch, NONE, 1.1 qt.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Chung-Yen Chang (candyz) fedora-extras-commits at redhat.com
Thu Aug 24 07:54:11 UTC 2006 

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28298/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Makefile.patch configure.patch gcin.conf gcin.spec 
	im-client.patch qt.patch 
Log Message:
auto-import gcin-1.2.2-12 on branch devel from gcin-1.2.2-12.src.rpm

Makefile.patch:

--- NEW FILE Makefile.patch ---
--- gcin-1.2.2/Makefile.orig	2006-08-17 13:13:29.000000000 +0800
+++ gcin-1.2.2/Makefile	2006-08-17 13:16:22.000000000 +0800
@@ -68,7 +68,7 @@
 	$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
 	rm -f core.*
 trad2sim:	sim2trad
-	ln -s sim2trad trad2sim
+	ln -sf sim2trad trad2sim
 
 gcin-setup:     $(OBJS_gcin_steup)
 	$(CC) -o $@ $(OBJS_gcin_steup) $(LDFLAGS)

configure.patch:

--- NEW FILE configure.patch ---
--- gcin-1.2.1/configure.orig	2006-08-17 09:09:27.000000000 +0800
+++ gcin-1.2.1/configure	2006-08-17 11:02:18.000000000 +0800
@@ -125,9 +125,9 @@
 
 
 OPTFLAGS="-g"
-if [ $prefix = /usr ]; then
-  OPTFLAGS="-O"
-fi
+#if [ $prefix = /usr ]; then
+#  OPTFLAGS="-O"
+#fi
 
 
 echo "CC=gcc" > config.mak
--- gcin-1.2.2/configure.orig	2006-08-17 13:25:47.000000000 +0800
+++ gcin-1.2.2/configure	2006-08-18 08:31:24.000000000 +0800
@@ -101,7 +101,7 @@
 bindir=$prefix/bin
 datadir=$prefix/share
 mandir=$datadir/man
-libdir=$prefix/lib
+libdir=$prefix/$LIB
 includedir=$prefix/include
 optdir=/opt
 GCIN_VERSION=`cat VERSION.gcin`


--- NEW FILE gcin.conf ---
XIM=gcin
XIM_PROGRAM=gcin
XIM_ARGS="-x gcin"
GTK_IM_MODULE=gcin
QT_IM_MODULE=gcin


--- NEW FILE gcin.spec ---
Name:           gcin
Version:        1.2.2
Release:        12%{?dist}
Summary:        Input method for Traditional Chinese

Group:          System Environment/Libraries
License:        LGPL
URL:            http://cle.linux.org.tw/gcin/
Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
Source1:        gcin.conf
Patch1:         im-client.patch
Patch2:         qt.patch
Patch3:         configure.patch
Patch4:         Makefile.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
BuildRequires:  libXtst-devel
Requires:       gtk2
Requires(post): %{_sbindir}/alternatives, chkconfig, desktop-file-utils
Requires(preun): %{_sbindir}/alternatives, chkconfig
Requires(postun): desktop-file-utils


%description
Gcin is a input method for Traditional Chinese with a GTK user interface.


%prep
%setup -q
%patch1 -p1 -b .im-client
%patch2 -p1 -b .qt
%patch3 -p1 -b .configure
%patch4 -p1 -b .Makefile
find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile


%build
./configure --prefix=%{_prefix} --libdir=%{_libdir}
perl -pi -e "s/^(OPTFLAGS.*=)/\1 %{optflags} /" config.mak
make
#make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
desktop-file-install \
  --delete-original \
  --vendor fedora \
  --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \
  --add-category X-Fedora \
  ${RPM_BUILD_ROOT}/%{_datadir}/applications/gcin-setup.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
%{_bindir}/update-gtk-immodules %{_host} >/dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || :
  %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc /etc/X11/xinit/xinput.d/gcin.conf 40


%postun
/sbin/ldconfig
%{_bindir}/update-gtk-immodules %{_host} >/dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || :


%preun
if [ $1 -eq 0 ]; then
    %{_sbindir}/alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/gcin.conf >/dev/null 2>&1 || :
fi


%files
%defattr(-,root,root,-)
%doc README COPYING Changelog
%config(noreplace) %{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
%{_bindir}/gcin
%{_bindir}/gcin-setup
%{_bindir}/gcin2tab
%{_bindir}/juyin-learn
%{_bindir}/phoa2d
%{_bindir}/phod2a
%{_bindir}/sim2trad
%{_bindir}/trad2sim
%{_bindir}/tsa2d
%{_bindir}/tsd2a
%{_bindir}/tslearn
%{_datadir}/applications/fedora-gcin-setup.desktop
%{_datadir}/gcin/
%{_datadir}/icons/gcin/
%{_datadir}/icons/gcin.png
%{_datadir}/icons/gcin-tray.png
%{_datadir}/icons/gcin-tray-sim.png
%{_mandir}/*/*
%{_libdir}/menu/gcin*
%{_libdir}/gtk-2.0/immodules/im-gcin.so
%{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
%{_libdir}/libgcin-im-client.so


%changelog
* Thu Aug 24 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-12
- modify spec file only for fc5 and later (branch the spec file)

* Thu Aug 24 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-11
- fix to handle fedora tag correctly

* Thu Aug 24 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-10
- Remove patch5 (not necessary)

* Wed Aug 23 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-9
- Fix patch5 for fc3 only bug

* Sun Aug 20 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-8
- Fix changelog

* Sun Aug 20 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-7
- Remove -devel subpackage
- install desktop file

* Sat Aug 19 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-6
- a few more fixes from Jens Petersen

* Sat Aug 19 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-5
- improvements from Jens Petersen:
- don't use configure macro
- add .conf suffix to xinput.d file and update install scripts for fc6
- move lib to libdir and drop ld.so.conf.d file
- other minor cleanup

* Sat Aug 19 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-4
- rebuild 1.2.2-4

* Fri Aug 18 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-3
- Add COPYING Changelog to doc
- Use Dist Tag

* Fri Aug 18 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-2
- fix x86_64 problems

* Tue Aug 17 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.2-1
- rebuild 1.2.2-1

* Tue Aug 17 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.1-7
- rebuild 1.2.1-7

* Wed Aug 16 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.1-4
- rebuild 1.2.1-4

* Thu Jul 13 2006 Chung-Yen Chang <candyz at cle.linux.org.tw> - 1.2.1-1
- update to 1.2.1

* Mon May 08 2006 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.2.0

* Mon May 01 2006 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.9

* Mon Apr 03 2006 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.8

* Wed Mar 29 2006 Chung-Yen Chang <candyz at cle.linux.org.tw>
- rebuild for FC5

* Wed Feb 22 2006 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.7

* Thu Feb 02 2006 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.6

* Sat Jan 07 2006 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.5

* Mon Dec 19 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.4-2

* Mon Dec 12 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.4

* Mon Nov 21 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.3

* Tue Nov 08 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.2

* Sun Oct 30 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.1

* Mon Oct 24 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.1.0

* Mon Oct 03 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.0.9

* Mon Sep 26 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.0.8

* Mon Sep 19 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.0.7

* Mon Sep 05 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.0.4

* Mon Aug 22 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.0.3

* Wed Aug 10 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.0.2

* Fri Jul 08 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.0.1

* Mon Jun 27 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 1.0.0

* Thu Jun 23 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.9.9

* Thu Jun 16 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- rebuild for fc4

* Tue May 31 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.9.7

* Tue May 19 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.9.6

* Tue May 12 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.9.5

* Wed May 04 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.9.3

* Mon Apr 25 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- fix alternatives

* Fri Apr 22 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.9.2

* Sat Apr 16 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.9.1

* Tue Apr 05 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.9.0

* Tue Mar 22 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.8.9

* Sat Mar 14 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.8.8

* Sat Mar 08 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.8.7

* Sat Mar 05 2005 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.8.6

* Mon Aug 23 2004 Chung-Yen Chang <candyz at cle.linux.org.tw>
- frist build for Fedora Core 2

im-client.patch:

--- NEW FILE im-client.patch ---
--- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
@@ -6,7 +6,7 @@
         -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
         -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
         -DFREEBSD=$(FREEBSD)
-OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt.o
+OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt-fpic.o
 
 .c.E:
 	$(CC) $(CFLAGS) -E -o $@ $<
@@ -43,6 +43,9 @@
 im-addr.o: ../im-srv/im-addr.c
 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 
+gcin-crypt-fpic.o: gcin-crypt.c
+	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+
 clean:
 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
 

qt.patch:

--- NEW FILE qt.patch ---
--- gcin-1.2.2/configure.orig	2006-05-03 10:40:12.000000000 +0800
+++ gcin-1.2.2/configure	2006-08-16 23:03:15.000000000 +0800
@@ -80,9 +80,9 @@
 fi
 
 QT_IM='N'
-for i in qt3 qt4
+for i in qt3 qt-3.3 qt-4
 do
-  QT_IM_DIR=/usr/lib/$i/plugins/$LIB/inputmethods
+  QT_IM_DIR=/usr/$LIB/$i/plugins/inputmethods
   echo "testing if you have QT_IM_MODULE dir:$QT_IM_DIR support"
   if [ -d  $QT_IM_DIR ]; then
     QT_IM='Y'
--- gcin-1.2.2/qt-im/Makefile.orig	2006-08-02 15:36:52.000000000 +0800
+++ gcin-1.2.2/qt-im/Makefile	2006-08-17 13:07:26.000000000 +0800
@@ -1,16 +1,12 @@
 include ../config.mak
 QTIM=$(QT)/plugins/inputmethods
 IMMODULES=$(libdir)/$(QTIM)
-ifeq ($(LIB), lib64)
-	IMMODULES_LOCAL=/usr/lib/$(QT)/plugins/lib64/inputmethods
-else
-	IMMODULES_LOCAL=/usr/lib/$(QTIM)
-endif
-INCS=-I../im-client -I/usr/lib/$(QT)/include  -I/usr/include/Xft2/X11/Xft  -I/usr/include/fontconfig -I/usr/include/freetype2
+IMMODULES_LOCAL=/usr/$(LIB)/$(QTIM)
+INCS=-I../im-client -I/usr/$(LIB)/$(QT)/include  -I/usr/include/Xft2/X11/Xft  -I/usr/include/fontconfig -I/usr/include/freetype2
 CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -fPIC  -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG
 OBJS=qgcininputcontextplugin.o qgcininputcontextplugin_my.o qgcininputcontext.o qgcininputcontext_x11.o
 .SUFFIXES:	.c .cpp .a .so .E .h
-LDFLAGS=-L/usr/lib/$(QT)/$(LIB) -L/usr/X11R6/$(LIB) -L../im-client -lqt-mt -lmng -ljpeg -lpng -lz \
+LDFLAGS=-L/usr/$(LIB)/$(QT)/lib -L/usr/X11R6/$(LIB) -L../im-client -lqt-mt -lmng -ljpeg -lpng -lz \
 -lXrender -lXrandr  -lXft -lfontconfig -lgcin-im-client \
 -lXext -lX11 -lm -lSM -lICE -ldl -lpthread
 all:	libqgcin.so
@@ -18,7 +14,7 @@
 .cpp.E:
 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
 .h.o:
-	/usr/lib/$(QT)/bin/moc $< -o $<_moc.cpp
+	/usr/$(LIB)/$(QT)/bin/moc $< -o $<_moc.cpp
 	$(CXX) -c -pipe $(CXXFLAGS) $(INCS) $<_moc.cpp -o $@
 
 libqgcin.so: $(OBJS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Aug 2006 07:52:21 -0000	1.1
+++ .cvsignore	24 Aug 2006 07:54:11 -0000	1.2
@@ -0,0 +1 @@
+gcin-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Aug 2006 07:52:21 -0000	1.1
+++ sources	24 Aug 2006 07:54:11 -0000	1.2
@@ -0,0 +1 @@
+2adc21cad0e3f9451d6e4662c3b99425  gcin-1.2.2.tar.bz2

More information about the scm-commits mailing list