rpms/kitutuki/F-13 kitutuki-0.9.5-makefile-misc-fix.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 kitutuki.spec, 1.3, 1.4 sources, 1.3, 1.4 kitutuki-0.9.3-makefile-misc-fix.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/kitutuki/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31961/F-13

Modified Files:
	.cvsignore kitutuki.spec sources 
Added Files:
	kitutuki-0.9.5-makefile-misc-fix.patch 
Removed Files:
	kitutuki-0.9.3-makefile-misc-fix.patch 
Log Message:
* Thu Feb 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.6-1
- Update to 0.9.6


kitutuki-0.9.5-makefile-misc-fix.patch:
 Makefile.in |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

--- NEW FILE kitutuki-0.9.5-makefile-misc-fix.patch ---
--- kitutuki-0.9.5/Makefile.in.mk	2010-02-23 21:36:49.000000000 +0900
+++ kitutuki-0.9.5/Makefile.in	2010-02-23 22:46:20.000000000 +0900
@@ -30,8 +30,8 @@
 all: kitutuki $(CYGWIN_DLL) libkitutuki.so.1.0 kitutuki.kio
 	rm -f install
 
-kitutuki.kio: kitutuki.ksh
-	./kitutuki -rn -c 'compile kitutuki.ksh'
+kitutuki.kio: kitutuki.ksh kitutuki
+	env LD_LIBRARY_PATH=$(shell pwd) ./kitutuki -rn -c 'compile kitutuki.ksh'
 
 clean:
 	rm -f kitutuki *.o $(CYGWIN_DLL) libkitutuki* kitutuki.kio
@@ -39,8 +39,8 @@
 distclean:
 	rm -f kitutuki *.o $(CYGWIN_DLL) libkitutuki* config.h Makefile kitutuki.kio
 
-kitutuki: config.h main.c cmdline.o $(OBJ)
-	$(CC) -o kitutuki main.c cmdline.o -DDATADIR=\"$(datadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DSYSTEM_MIGEMODIR=\"$(SYSTEM_MIGEMODIR)\" $(OBJ) $(LIBS) $(CFLAGS)
+kitutuki: config.h main.c cmdline.o libkitutuki.so
+	$(CC) -o kitutuki main.c cmdline.o -DDATADIR=\"$(datadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DSYSTEM_MIGEMODIR=\"$(SYSTEM_MIGEMODIR)\" -L. -lkitutuki $(LIBS) $(CFLAGS)
 
 kitutuki.o: kitutuki.c
 	$(CC) -c kitutuki.c -DDATADIR=\"$(datadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DDOCDIR=\"$(docdir)\" $(CFLAGS)
@@ -49,13 +49,17 @@
 # kitutuki ライブラリ
 ###########################################################################
 libkitutuki.so.1.0: $(OBJ)
-	gcc -shared -Wl,-soname,libkitutuki.so.1 -o libkitutuki.so.1.0 kitutuki.o minato_vector.o minato_string.o minato_curses.o minato_hash.o minato_debug.o minato_list.o minato_kanji.o minato_extra.o minato_buffer.o -lc $(LIBS)
+	gcc -shared -Wl,-soname,libkitutuki.so.1 -o libkitutuki.so.1.0 $(OBJ) -lc $(LIBS)
+
+libkitutuki.so: libkitutuki.so.1.0
+	ln -sf libkitutuki.so.1.0 libkitutuki.so.1
+	ln -sf libkitutuki.so.1.0 libkitutuki.so
 
 ###########################################################################
 # cygwin dll
 ###########################################################################
-$(CYGWIN_DLL):
-	gcc -shared -o kitutuki.dll kitutuki.o minato_vector.o minato_string.o minato_curses.o minato_hash.o minato_debug.o minato_list.o minato_kanji.o minato_extra.o minato_buffer.o -lcurses -lonig -liconv
+$(CYGWIN_DLL): $(OBJ)
+	gcc -shared -o kitutuki.dll $(OBJ) -lcurses -lonig -liconv
 
 ###########################################################################
 # インストール
@@ -78,8 +82,9 @@
 	install kitutuki.h -m 644 "$(includedir)"
 	install usage.ja.txt -m 644 "$(docdir)"
 	install usage.en.txt -m 644 "$(docdir)"
-	install libkitutuki.so.1.0 -s -m 644 "$(libdir)"
-	ln -s -f "$(libdir)"/libkitutuki.so.1.0 "$(libdir)"/libkitutuki.so
+	install libkitutuki.so.1.0 -s -m 755 "$(libdir)"
+	ln -s -f libkitutuki.so.1.0 "$(libdir)"/libkitutuki.so.1
+	ln -s -f libkitutuki.so.1.0 "$(libdir)"/libkitutuki.so
 	rm -f $(bindir)/kitutuki; install kitutuki -s -m 755 "$(bindir)"
 	if [ -e "$(CYGWIN_DLL)" ]; then install kitutuki.dll -s -m 644 "$(libdir)"; fi
 	install kitutuki.ksh -m 644 $(sysconfdir)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kitutuki/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Feb 2010 18:45:54 -0000	1.3
+++ .cvsignore	25 Feb 2010 06:10:48 -0000	1.4
@@ -1 +1 @@
-kitutuki-0.9.5.tgz
+kitutuki-0.9.6.tgz


Index: kitutuki.spec
===================================================================
RCS file: /cvs/extras/rpms/kitutuki/F-13/kitutuki.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kitutuki.spec	22 Feb 2010 18:45:54 -0000	1.3
+++ kitutuki.spec	25 Feb 2010 06:10:48 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		kitutuki
-Version:	0.9.5
+Version:	0.9.6
 Release:	1%{?dist}
 Summary:	Shell script language
 Summary(ja):	シェルスクリプティング言語 
@@ -11,7 +11,7 @@ Source0:	http://ab25cq.web.fc2.com/%{nam
 ## Not sent to the upstream, must do later
 ##
 # Misc fixes for Makefile
-Patch0:		kitutuki-0.9.3-makefile-misc-fix.patch
+Patch0:		kitutuki-0.9.5-makefile-misc-fix.patch
 # Patch for kitutuki_help
 Patch1:		kitutuki-0.9.1-kitutuki_help.patch
 # Patch for configure, need autoconf
@@ -44,10 +44,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 
-# Fix timestamps
-touch current_time
-find . -type f | xargs touch -r current_time
-
 # Makefile
 %patch0 -p1 -b .mk
 sed -i.strip -e '/install/s| -s | |' Makefile.in
@@ -123,6 +119,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.6-1
+- Update to 0.9.6
+
+* Tue Feb 23 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.5-2.respin1
+- 0.9.5 respun
+
 * Tue Feb 23 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.5-1
 - Update to 0.9.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kitutuki/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Feb 2010 18:45:54 -0000	1.3
+++ sources	25 Feb 2010 06:10:49 -0000	1.4
@@ -1 +1 @@
-3638ed512e4988b3bd0c64462da7bd4f  kitutuki-0.9.5.tgz
+b268730903dd83fa5e42fe1fffb72845  kitutuki-0.9.6.tgz


--- kitutuki-0.9.3-makefile-misc-fix.patch DELETED ---