Compare commits
30 Commits
F-12-start
...
master
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | b2ded47d83 | |
Fedora Release Engineering | 089f54e028 | |
Parag Nemade | 6047ac6c5d | |
Fedora Release Engineering | 6925eeff76 | |
Jason Tibbitts | d3fd9c46cf | |
Igor Gnatenko | cc3b14a991 | |
Igor Gnatenko | 3563d0fb2d | |
Igor Gnatenko | 6bdbb2bcf5 | |
Fedora Release Engineering | cc8e2954b3 | |
Fedora Release Engineering | 02f05d9c5e | |
Fedora Release Engineering | 8c223d2dbd | |
Fedora Release Engineering | 64b3149418 | |
Fedora Release Engineering | c787aa6953 | |
Dennis Gilmore | 4cee9c8548 | |
Kalev Lember | 5ae0e7e391 | |
Peter Robinson | d0fb156f4b | |
Dennis Gilmore | b695a9d37b | |
Dennis Gilmore | 172c0df536 | |
Ding-Yi Chen | 64b14e54b8 | |
Ding-Yi Chen | 2988ec7fd0 | |
Dennis Gilmore | e4668f3c61 | |
Dennis Gilmore | d8d409e84d | |
Dennis Gilmore | e5396a0d9d | |
Dennis Gilmore | 51c950cb78 | |
Dennis Gilmore | bd673afea5 | |
Ding-Yi Chen | 6767688990 | |
Fedora Release Engineering | ff5a8c80a5 | |
Ding-Yi Chen | f5ffb03665 | |
Ding-Yi Chen | 19ba2968bc | |
Bill Nottingham | 34676333b5 |
|
@ -1,2 +0,0 @@
|
|||
zhcon_0.2.6-5.2.diff.gz
|
||||
zhcon_0.2.6.orig.tar.gz
|
|
@ -0,0 +1,4 @@
|
|||
zhcon_0.2.6-6.diff.gz
|
||||
zhcon_0.2.6.orig.tar.gz
|
||||
/zhcon_0.2.6-6.1.diff.gz
|
||||
/zhcon_0.2.6.orig.tar.gz
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: zhcon
|
||||
# $Id$
|
||||
NAME := zhcon
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
|
@ -1,4 +0,0 @@
|
|||
zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288
|
||||
zhcon-0_2_6-10_fc9:HEAD:zhcon-0.2.6-10.fc9.src.rpm:1217222754
|
||||
zhcon-0_2_6-11_fc9:HEAD:zhcon-0.2.6-11.fc9.src.rpm:1227579222
|
||||
zhcon-0_2_6-12_fc9:HEAD:zhcon-0.2.6-12.fc9.src.rpm:1227584988
|
2
sources
2
sources
|
@ -1,2 +1,2 @@
|
|||
e7f30d5ecc493ff8e090192fda0116b5 zhcon_0.2.6-5.2.diff.gz
|
||||
3d60dc62f734d32b909c6ef631729bbe zhcon_0.2.6-6.1.diff.gz
|
||||
0f765cbe444776c9051a2b7c213737eb zhcon_0.2.6.orig.tar.gz
|
||||
|
|
|
@ -175,24 +175,6 @@ diff -up ./src/gbkdecoder.cpp.gcc43 ./src/gbkdecoder.cpp
|
|||
n += (c2 - 0x40);
|
||||
return n;
|
||||
}
|
||||
diff -up ./src/graphdev.cpp.gcc43 ./src/graphdev.cpp
|
||||
--- ./src/graphdev.cpp.gcc43 2006-04-25 02:38:26.000000000 +1000
|
||||
+++ ./src/graphdev.cpp 2008-07-15 12:31:16.000000000 +1000
|
||||
@@ -20,12 +20,14 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
+#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/mman.h>
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
+#include <string.h>
|
||||
#include "debug.h"
|
||||
|
||||
#include "display/fbdev.h"
|
||||
diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c
|
||||
--- ./src/iconv_string.c.gcc43 2006-04-25 02:38:27.000000000 +1000
|
||||
+++ ./src/iconv_string.c 2008-07-15 12:31:16.000000000 +1000
|
||||
|
@ -225,17 +207,6 @@ diff -up src/inputmanager.h.gcc43 src/inputmanager.h
|
|||
|
||||
#include "mouse.h"
|
||||
#if defined(__FreeBSD__)
|
||||
diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp
|
||||
--- ./src/inputmanager.cpp.gcc43 2006-05-03 03:18:39.000000000 +1000
|
||||
+++ ./src/inputmanager.cpp 2008-07-15 12:31:16.000000000 +1000
|
||||
@@ -24,6 +24,7 @@ using namespace std;
|
||||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
#include <string>
|
||||
+#include <stdlib.h>
|
||||
|
||||
#include "global.h"
|
||||
#include "debug.h"
|
||||
--- ./src/nativeinputserver.h.gcc43 2006-04-25 02:38:26.000000000 +1000
|
||||
+++ ./src/nativeinputserver.h 2008-07-15 12:31:16.000000000 +1000
|
||||
@@ -62,7 +62,7 @@ class NativeInputServer : public InputSe
|
||||
|
|
97
zhcon.spec
97
zhcon.spec
|
@ -1,12 +1,10 @@
|
|||
Name: zhcon
|
||||
Summary: A Fast Console CJK System Using FrameBuffer
|
||||
Version: 0.2.6
|
||||
Release: 14%{?dist}
|
||||
Group: Applications/System
|
||||
Release: 37%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://zhcon.sourceforge.net/
|
||||
Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz
|
||||
Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-5.2.diff.gz
|
||||
Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-6.1.diff.gz
|
||||
Patch1: %{name}-%{version}-flags.patch
|
||||
Patch2: %{name}-%{version}-path-define.patch
|
||||
Patch3: %{name}-%{version}-gcc43.patch
|
||||
|
@ -22,7 +20,7 @@ Summary(zh_TW): Zhcon 是一個支援 Framebuffer 及多內碼 Linux 中日韓
|
|||
%endif
|
||||
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: autoconf automake
|
||||
BuildRequires: gettext-devel ncurses-devel gpm-devel
|
||||
Requires: gpm ncurses%{!?ncurse_libs_postfix: }
|
||||
|
@ -45,9 +43,10 @@ zhcon 是一個支援 Framebuffer 與多内碼的 Linux 中日韓文主控台。
|
|||
它能够在控制台上顯示簡體中文、繁體中文、日文、韓文
|
||||
等雙位元組字元。支援多种输入法。
|
||||
現支援的內碼有: UTF8, GB2312, GBK, BIG5, JIS 及 KSC。
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .5-2
|
||||
%patch0 -p1 -b .6-diff
|
||||
%patch1 -p1 -b .flags
|
||||
%patch2 -p0 -b .path-define
|
||||
%patch3 -p0 -b .gcc43
|
||||
|
@ -56,6 +55,8 @@ zhcon 是一個支援 Framebuffer 與多内碼的 Linux 中日韓文主控台。
|
|||
%patch6 -p0 -b .xf86int10
|
||||
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)
|
||||
# liu5 is a non-free input method
|
||||
rm -f input/big5-liu5.mb
|
||||
|
||||
%build
|
||||
# exit if bootstrap fails
|
||||
|
@ -64,19 +65,18 @@ sed -i -e 's|set -x|set -e -x|' bootstrap
|
|||
touch config.rpath
|
||||
|
||||
./bootstrap
|
||||
autoreconf -ivf
|
||||
%global _hardened_build 1
|
||||
|
||||
%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
|
||||
%doc AUTHORS ChangeLog README README.utf8 THANKS TODO doc/bpsf.txt doc/README.html
|
||||
%license COPYING
|
||||
%lang(zh_CN) %doc doc/manual* doc/poem.gb doc/poem.gb.utf8
|
||||
%lang(zh_TW) %doc doc/poem.big5
|
||||
%{_mandir}/man1/*
|
||||
|
@ -85,6 +85,77 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%{_datadir}/%{name}/
|
||||
|
||||
%changelog
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-36
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Aug 21 2018 Parag Nemade <pnemade AT fedoraproject.org> - 0.2.6-35
|
||||
- Fix FTBFS(rh#1606790)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.2.6-27
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed May 22 2013 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-23
|
||||
- Resolves: Bug 965518 - zhcon package should be built with PIE flags
|
||||
|
||||
* Mon Apr 15 2013 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-22
|
||||
- Resolves: Bug 926861 - zhcon: Does not support aarch64 in f19 and rawhide
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-19
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Nov 19 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-16
|
||||
- Applied Debian's zhcon_0.2.6-6-1.diff.gz patch.
|
||||
- Remove input/big5-liu5.mb, as it may cause license issue.
|
||||
|
||||
* Mon Jan 04 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-15
|
||||
- Applied Debian's zhcon_0.2.6-6.diff.gz patch.
|
||||
- Fixed Bug 539125 - FTBFS zhcon-0.2.6-14.fc12
|
||||
|
||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
|
@ -94,7 +165,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
* Tue Nov 25 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-12
|
||||
- Debian provide patch of zhcon_0.2.6-5.2.diff.gz
|
||||
|
||||
* Mon Jul 15 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-10
|
||||
* Tue Jul 15 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-10
|
||||
- Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs.
|
||||
- Add gpm as Required
|
||||
|
||||
|
|
Loading…
Reference in New Issue