From 598a88a6d0302a0a500ba93c731b86e09fbb4c28 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 01:20:16 +0000 Subject: [PATCH 1/9] Initialize branch F-9 for wkf --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 6faca9145a5fea666887a0193ed057fb9039066c Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 31 May 2008 15:31:59 +0000 Subject: [PATCH 2/9] - Explicitly override config.{guess,sub} (due to redhat-rpm-config change on F-10) --- wkf.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wkf.spec b/wkf.spec index 7209b30..f3ff23e 100644 --- a/wkf.spec +++ b/wkf.spec @@ -1,6 +1,6 @@ Name: wkf Version: 1.3.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Japanese Kanji code converting filter Group: System Environment/Libraries @@ -40,6 +40,8 @@ developing applications that use %{name}. %setup -q %patch0 -p1 -b .func_declare +%{__cp} -p /usr/lib/rpm/config.{guess,sub} . + for f in \ API \ HISTORY \ @@ -105,6 +107,10 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' \ %changelog +* Sun Jun 1 2008 Mamoru Tasaka - 1.3.11-3 +- Explicitly override config.{guess,sub} (due to redhat-rpm-config + change on F-10) + * Thu Apr 3 2008 Mamoru Tasaka - 1.3.11-2 - Fix implicit function declaration From 9269fec2c977732f88cfda0e2a21c58682714e14 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 24 Feb 2009 05:44:08 +0000 Subject: [PATCH 3/9] bump --- wkf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wkf.spec b/wkf.spec index f3ff23e..027d5d4 100644 --- a/wkf.spec +++ b/wkf.spec @@ -1,6 +1,6 @@ Name: wkf Version: 1.3.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Japanese Kanji code converting filter Group: System Environment/Libraries @@ -107,6 +107,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' \ %changelog +* Tue Feb 24 2009 Mamoru Tasaka - 1.3.11-4 +- F-11: Mass rebuild + * Sun Jun 1 2008 Mamoru Tasaka - 1.3.11-3 - Explicitly override config.{guess,sub} (due to redhat-rpm-config change on F-10) From a1088be61e335c525194fcbb51cfa96d4706c339 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Fri, 24 Jul 2009 20:01:52 +0000 Subject: [PATCH 4/9] - F-12: Mass rebuild --- wkf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wkf.spec b/wkf.spec index 027d5d4..ee92538 100644 --- a/wkf.spec +++ b/wkf.spec @@ -1,6 +1,6 @@ Name: wkf Version: 1.3.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Japanese Kanji code converting filter Group: System Environment/Libraries @@ -107,6 +107,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' \ %changelog +* Sat Jul 25 2009 Mamoru Tasaka - 1.3.11-5 +- F-12: Mass rebuild + * Tue Feb 24 2009 Mamoru Tasaka - 1.3.11-4 - F-11: Mass rebuild From 9c30487974be1e09a19a21493b4aaa85dd47056b Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 10 Aug 2009 17:20:26 +0000 Subject: [PATCH 5/9] - Source changed, rebuild --- sources | 2 +- wkf.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 56ba14b..4bab7ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a48f7744d1fbbcdad45ce877cfc6e0f3 wkf-1.3.11.tar.bz2 +f63b392eab49a338f9b2cefd0b3ec25b wkf-1.3.11.tar.bz2 diff --git a/wkf.spec b/wkf.spec index ee92538..3d72afa 100644 --- a/wkf.spec +++ b/wkf.spec @@ -1,6 +1,6 @@ Name: wkf Version: 1.3.11 -Release: 5%{?dist} +Release: 6.respin1%{?dist} Summary: Japanese Kanji code converting filter Group: System Environment/Libraries @@ -107,6 +107,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' \ %changelog +* Tue Aug 11 2009 Mamoru Tasaka - 1.3.11-6.respin1 +- Source changed, rebuild + * Sat Jul 25 2009 Mamoru Tasaka - 1.3.11-5 - F-12: Mass rebuild From 4d88bd3ca7fb6f567a04590c0a3572d6a6802b6b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:15 +0000 Subject: [PATCH 6/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a5256fe..754b2ef 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wkf 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ffec8081d5e41982281a27a2bc307c238d08f9b3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:31 +0000 Subject: [PATCH 7/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a5256fe..754b2ef 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wkf 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9e5cf92510a55d880b36c00d5d6dee2e62d210bc Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 14 Jul 2010 14:43:42 +0000 Subject: [PATCH 8/9] Farewell, wkf --- .cvsignore | 1 - Makefile | 21 ----- dead.package | 4 + sources | 1 - wkf-1.3.11-func-declaration.patch | 22 ----- wkf.spec | 131 ------------------------------ 6 files changed, 4 insertions(+), 176 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wkf-1.3.11-func-declaration.patch delete mode 100644 wkf.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index aa1a46e..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wkf-1.3.11.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 754b2ef..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wkf -# $Id$ -NAME := wkf -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 $$d/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) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..74aba09 --- /dev/null +++ b/dead.package @@ -0,0 +1,4 @@ +2010-07-14 Mamoru Tasaka + +- This package is used only by mfiler2, and I removed mfiler2 + from distribution. diff --git a/sources b/sources deleted file mode 100644 index 4bab7ea..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f63b392eab49a338f9b2cefd0b3ec25b wkf-1.3.11.tar.bz2 diff --git a/wkf-1.3.11-func-declaration.patch b/wkf-1.3.11-func-declaration.patch deleted file mode 100644 index c07beee..0000000 --- a/wkf-1.3.11-func-declaration.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- wkf-1.3.11/functions.h.debug 2005-04-05 17:26:56.000000000 +0900 -+++ wkf-1.3.11/functions.h 2008-04-03 23:43:07.000000000 +0900 -@@ -56,4 +56,7 @@ - extern void setOutputStringBuffer(String, unsigned int); - extern conv_t convertKanjiCode(kcode_t, kcode_t); - -+/* strlcpy.c */ -+extern size_t strlcpy(char *dst, const char *src, size_t siz); -+ - #endif /* _FUNCTIONS_H */ ---- wkf-1.3.11/wkf.c.debug 2007-07-06 01:35:21.000000000 +0900 -+++ wkf-1.3.11/wkf.c 2008-04-03 23:47:06.000000000 +0900 -@@ -44,6 +44,9 @@ - #include "config.h" - #endif /* HAVE_CONFIG_H */ - -+/* For asprintf */ -+#define _GNU_SOURCE -+ - #include - #include - #ifndef _WIN32 diff --git a/wkf.spec b/wkf.spec deleted file mode 100644 index 3d72afa..0000000 --- a/wkf.spec +++ /dev/null @@ -1,131 +0,0 @@ -Name: wkf -Version: 1.3.11 -Release: 6.respin1%{?dist} -Summary: Japanese Kanji code converting filter - -Group: System Environment/Libraries -License: BSD -URL: http://www.mysticwall.com/software/wkf/ -Source0: http://www.mysticwall.com/download/%{name}-%{version}.tar.bz2 -Patch0: wkf-1.3.11-func-declaration.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: groff -Requires: %{name}-libs = %{version}-%{release} - -%description -WKF is a Japanese Kanji code converting filter. - - -%package libs -Summary: Libraries for WKF filter -Group: System Environment/Libraries - -%description libs -WKF is a Japanese Kanji code converting filter. -This package contains shared libraries for WKF. - - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - - -%prep -%setup -q -%patch0 -p1 -b .func_declare - -%{__cp} -p /usr/lib/rpm/config.{guess,sub} . - -for f in \ - API \ - HISTORY \ - JAPANESE \ - README \ - wkf.1 - do - iconv -f EUC-JP -t UTF-8 $f > $f.tmp && \ - ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \ - %{__rm} -f $f.tmp -done - -%build -%configure --disable-static -%{__make} %{?_smp_mflags} \ - CC="%{__cc} %{optflags} -Werror-implicit-function-declaration" - - -%install -%{__rm} -rf $RPM_BUILD_ROOT - -# Use %%makeinstall -%makeinstall \ - INSTALL="%{__install} -p" \ - INSTALL_PROGRAM="%{__install} -p" \ - INSTALL_DATA="%{__install} -p -m 0644" \ - RM="%{__rm} -f" - -%{__chmod} 0755 $RPM_BUILD_ROOT%{_libdir}/libwkf*.so.* -find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' \ - -exec %{__rm} -f {} ';' - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -%check -%{__make} test - -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc README - -%{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* - -%files libs -%defattr(-,root,root,-) -%doc HISTORY -%doc TODO - -%{_libdir}/libwkf*.so.* - -%files devel -%defattr(-,root,root,-) -%doc API - -%{_includedir}/wkf.h -%{_libdir}/libwkf*.so - - -%changelog -* Tue Aug 11 2009 Mamoru Tasaka - 1.3.11-6.respin1 -- Source changed, rebuild - -* Sat Jul 25 2009 Mamoru Tasaka - 1.3.11-5 -- F-12: Mass rebuild - -* Tue Feb 24 2009 Mamoru Tasaka - 1.3.11-4 -- F-11: Mass rebuild - -* Sun Jun 1 2008 Mamoru Tasaka - 1.3.11-3 -- Explicitly override config.{guess,sub} (due to redhat-rpm-config - change on F-10) - -* Thu Apr 3 2008 Mamoru Tasaka - 1.3.11-2 -- Fix implicit function declaration - -* Sat Feb 9 2008 Mamoru Tasaka -- Rebuild against gcc43 (F-9) - -* Wed Dec 5 2007 Mamoru Tasaka - 1.3.11-1 -- Initial packaging - From 6f8191d246e23314f1fe549ce056c3b399ece9d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:22:13 +0000 Subject: [PATCH 9/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 754b2ef..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wkf -# $Id$ -NAME := wkf -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9