rpms/zhcon/FC-6 zhcon-0.2.6-flags.patch, NONE, 1.1 zhcon-0.2.6-path-define.patch, NONE, 1.1 zhcon-0.2.6-path.patch, NONE, 1.1 zhcon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Hu Zheng (zhu)]

Author: zhu

Update of /cvs/extras/rpms/zhcon/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22520/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	zhcon-0.2.6-flags.patch zhcon-0.2.6-path-define.patch 
	zhcon-0.2.6-path.patch zhcon.spec 
Log Message:
add source files

zhcon-0.2.6-flags.patch:

--- NEW FILE zhcon-0.2.6-flags.patch ---
--- zhcon-0.2.5/tools/Makefile.am.flags	2006-04-25 01:38:46.000000000 +0900
+++ zhcon-0.2.5/tools/Makefile.am	2007-02-16 01:54:04.000000000 +0900
@@ -9,11 +9,6 @@
 #getbpsf_LDADD = -L/usr/X11R6/lib -lX11
 #getbpsf_CPPFLAGS = -I/usr/X11R6/include
 
-LDFLAGS=
-CXXFLAGS=
-CCFLAGS=
-LIBS=
-
 EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\
              gpm-1.19.6-patched.tar.gz
 

zhcon-0.2.6-path-define.patch:

--- NEW FILE zhcon-0.2.6-path-define.patch ---
--- zhcon-0.2.5/configure.in.path_define	2007-02-16 03:47:08.000000000 +0900
+++ zhcon-0.2.5/configure.in	2007-02-16 03:48:31.000000000 +0900
@@ -175,6 +175,16 @@
 AC_CHECK_LIB(gpm,main,,usegpm="no")
 
 dnl-----------------------------------------------------------------------
+dnl Fedora specific fix
+dnl-----------------------------------------------------------------------
+CFLAGS="$CFLAGS -DDATADIR=\\\"$datadir\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\""
+CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\""
+
+eval DATADIR=${datadir}
+eval DATADIR=$DATADIR
+AC_SUBST(DATADIR)
+
+dnl-----------------------------------------------------------------------
 dnl Checks for libggi
 dnl-----------------------------------------------------------------------
 useggi="yes"
@@ -208,7 +218,7 @@
     libggi support:            ${useggi}
     unicon support:            ${useunicon}
     zhcon binary dir:          `eval "echo \`eval \"echo ${bindir}\"\`"`
-    zhcon files dir:           `eval "echo \`eval \"echo ${libdir}/${PACKAGE}\"\`"`
+    zhcon files dir:           `eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
 
 Config complete, now type make to build zhcon.
 Good Luck!
--- zhcon-0.2.5/font/Makefile.am.path_define	2007-02-16 03:47:08.000000000 +0900
+++ zhcon-0.2.5/font/Makefile.am	2007-02-16 03:47:08.000000000 +0900
@@ -1,8 +1,8 @@
 EXTRA_DIST = *.bpsf
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
-	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/
+	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
+	-rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf
--- zhcon-0.2.5/input/Makefile.am.path_define	2007-02-16 03:47:08.000000000 +0900
+++ zhcon-0.2.5/input/Makefile.am	2007-02-16 03:47:08.000000000 +0900
@@ -1,8 +1,8 @@
 EXTRA_DIST = *.mb
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
-	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/
+	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
+	-rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb
--- zhcon-0.2.5/src/Makefile.am.path_define	2007-02-16 03:47:08.000000000 +0900
+++ zhcon-0.2.5/src/Makefile.am	2007-02-16 03:47:08.000000000 +0900
@@ -11,11 +11,11 @@
 	chmod 4755 $(DESTDIR)$(bindir)/zhcon
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/etc
-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf
+	-rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
--- zhcon-0.2.5/src/nativeinputserver.cpp.path_define	2006-04-25 01:38:27.000000000 +0900
+++ zhcon-0.2.5/src/nativeinputserver.cpp	2007-02-16 03:47:08.000000000 +0900
@@ -30,7 +30,7 @@
 #include "nativeinputserver.h"
 #include "keymap.h"
 
-string NativeInputServer::mDataPath = PREFIX"/lib/zhcon/";
+string NativeInputServer::mDataPath = DATADIR"/zhcon/";
 
 NativeInputServer::Symbol NativeInputServer::mFullSymbolTable[] = {
     {'.', "¡£"}
--- zhcon-0.2.5/src/zhcon.cpp.path_define	2007-02-16 03:47:08.000000000 +0900
+++ zhcon-0.2.5/src/zhcon.cpp	2007-02-16 03:47:08.000000000 +0900
@@ -123,7 +123,7 @@
     string cfgfile = getenv("HOME");
     cfgfile += "/.zhconrc";
     if (access(cfgfile.c_str(), R_OK) != 0)
-        cfgfile = PREFIX "/etc/zhcon.conf";
+        cfgfile = SYSCONFDIR "/zhcon.conf";
 
     //for debug,a pause enable us to attach zhcon's pid in gdb
     //char c;cin>>c;
@@ -621,7 +621,7 @@
     if (getenv("LC_ALL"))
         mOldLocale = getenv("LC_ALL");
 
-    string prefix = PREFIX"/lib/zhcon/";
+    string prefix = DATADIR "/zhcon/";
     mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT));
     mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT));
     mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT));
@@ -752,10 +752,10 @@
     InputManager::SetTty(mConFd, ttyno, mTtyFd);
     
     string s;
-    s = f.GetOption(string("zhconpath"), string(PREFIX"/lib/zhcon/"));
+    s = f.GetOption(string("zhconpath"), string(DATADIR "/zhcon/"));
     NativeInputServer::SetDataPath(s);
 #ifdef HAVE_UNICON_LIB
-    s = f.GetOption(string("uniconpath"), string("/usr/lib/unicon/"));
+    s = f.GetOption(string("uniconpath"), string(DATADIR "/unicon/"));
     UniconInputServer::SetDataPath(s);
 #endif
     string sOverSpot, sNativeBar;

zhcon-0.2.6-path.patch:

--- NEW FILE zhcon-0.2.6-path.patch ---
diff -ru zhcon-0.2.5/doc/Makefile.am zhcon-0.2.6/doc/Makefile.am
--- zhcon-0.2.5/doc/Makefile.am	2006-05-03 01:57:18.000000000 +0800
+++ zhcon-0.2.6/doc/Makefile.am	2007-02-12 17:46:12.000000000 +0800
@@ -3,8 +3,8 @@
 EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz
 
 install-data-local:
-	$(mkinstalldirs) $(mandir)/man1/
-	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
+	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1
 
 uninstall-local:
-	-rm -f $(mandir)/man1/zhcon.1
+	-rm -f $(DESTDIR)$(mandir)/man1/zhcon.1
diff -ru zhcon-0.2.5/font/Makefile.am zhcon-0.2.6/font/Makefile.am
--- zhcon-0.2.5/font/Makefile.am	2006-04-25 00:39:04.000000000 +0800
+++ zhcon-0.2.6/font/Makefile.am	2007-02-12 17:47:32.000000000 +0800
@@ -1,8 +1,8 @@
 EXTRA_DIST = *.bpsf
 
 install-data-local:
-	$(mkinstalldirs) $(libdir)/zhcon/font/
-	$(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/
+	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
+	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
 
 uninstall-local:
-	-rm -f $(libdir)/zhcon/font/*.bpsf
+	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
diff -ru zhcon-0.2.5/input/Makefile.am zhcon-0.2.6/input/Makefile.am
--- zhcon-0.2.5/input/Makefile.am	2006-04-25 00:38:44.000000000 +0800
+++ zhcon-0.2.6/input/Makefile.am	2007-02-12 17:48:22.000000000 +0800
@@ -1,8 +1,8 @@
 EXTRA_DIST = *.mb
 
 install-data-local:
-	$(mkinstalldirs) $(libdir)/zhcon/input/
-	$(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/
+	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
+	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
 
 uninstall-local:
-	-rm -f $(libdir)/zhcon/input/*.mb
+	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
diff -ru zhcon-0.2.5/src/Makefile.am zhcon-0.2.6/src/Makefile.am
--- zhcon-0.2.5/src/Makefile.am	2006-05-03 01:12:41.000000000 +0800
+++ zhcon-0.2.6/src/Makefile.am	2007-02-12 17:45:59.000000000 +0800
@@ -8,14 +8,14 @@
 SUBDIRS = display
 
 install-exec-local:
-	chmod 4755 $(bindir)/zhcon
+	chmod 4755 $(DESTDIR)$(bindir)/zhcon
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/etc
-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
+	$(mkinstalldirs) $(DESTDIR)$(prefix)/etc
+	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(prefix)/etc/zhcon.conf
 
 uninstall-local:
-	-rm -f $(prefix)/etc/zhcon.conf
+	-rm -f $(DESTDIR)$(prefix)/etc/zhcon.conf
 
 # set the include path found by configure
 INCLUDES= $(all_includes)


--- NEW FILE zhcon.spec ---
Name: zhcon
Summary: A Fast Console CJK System Using FrameBuffer
Version: 0.2.6
Release: 3%{?dist}
Group: Applications/System
License: GPL
URL: http://www.sourceforge.net/projects/%{name}/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5.tar.gz
Patch0: http://downloads.sourceforge.net/%{name}/%{name}-0.2.5-to-0.2.6.diff.gz
Patch1: zhcon-0.2.6-path.patch
Patch2: zhcon-0.2.6-path-define.patch
Patch3: zhcon-0.2.6-flags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Buildrequires: autoconf automake
Buildrequires: gettext-devel ncurses-devel gpm-devel

%description
Zhcon is a fast Linux Console Chinese System which supports
framebuffer device.It can display Chinese, Japanese or Korean
double byte characters.Supported language encodings include:
GB2312, GBK, BIG5, JIS and KSC.

%description -l zh_CN
zhcon是一个工作在LinuxæŽ§åˆ¶å°ä¸‹çš„å¤šå†…ç ä¸­æ–‡å¹³å°ã€‚
它能够控制台上显示简体中文、繁体中文、日文、韩文
等双字节字符。支持多种输入法。

%prep
%setup -q -n zhcon-0.2.5
%patch0 -p1 -b .0.26
%patch1 -p1 -b .instpath
%patch2 -p1 -b .path_define
%patch3 -p1 -b .flags
iconv -f GB2312 -t UTF-8 ChangeLog -o ChangeLog.utf && mv -f ChangeLog.utf ChangeLog
( cd doc; tar -zxf html.tar.gz; chmod 755 manual)

%build
# exit if bootstrap fails
# missing config.rpath causes automake failure
sed -i -e 's|set -x|set -e -x|' bootstrap
touch config.rpath

./bootstrap
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -c -p" install

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html
%lang(zh_CN) %doc doc/manual* doc/poem.gb doc/poem.gb.utf8
%lang(zh_TW) %doc doc/poem.big5
%{_mandir}/man1/*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(4755,root,root) %{_bindir}/%{name}
%{_datadir}/%{name}/

%changelog
* Tue Feb 27 2007 Hu Zheng <zhu at redhat.com> - 0.2.6-3
- Update for review.

* Thu Feb 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.6-2.1
- Add source URL
- Check if bootstrap exited with success
- Change the directory of %%{name}.conf
- Move all files in %%{_libdir} to %%{_datadir} (no libraries is
  found)
- Add BR gpm-devel
- Pass optflags correctly
- Keep timestamps

* Thu Feb 15 2007 Hu Zheng <zhu at redhat.com> - 0.2.6-2
- Fix spec file.

* Mon Feb 12 2007 Hu Zheng <zhu at redhat.com> - 0.2.6-1
- Initial build for Fedora Extra



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zhcon/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Mar 2007 07:27:07 -0000	1.1
+++ .cvsignore	27 Mar 2007 07:25:36 -0000	1.2
@@ -0,0 +1,2 @@
+zhcon-0.2.5.tar.gz
+zhcon-0.2.5-to-0.2.6.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zhcon/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Mar 2007 07:27:07 -0000	1.1
+++ sources	27 Mar 2007 07:25:36 -0000	1.2
@@ -0,0 +1,2 @@
+79e1c68aab8341e32129f61c1670baeb  zhcon-0.2.5.tar.gz
+971f68507f9c48a6b5cbee4ba0c1e2a6  zhcon-0.2.5-to-0.2.6.diff.gz