rpms/kakasi/devel kakasi-multilib.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kakasi.spec, 1.6, 1.7

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/kakasi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1473

Modified Files:
	.cvsignore kakasi.spec 
Added Files:
	kakasi-multilib.patch 
Log Message:
* Tue Nov 20 2007 Akira TAGOH <tagoh at redhat.com> - 2.3.4-25
- Clean up spec file.
- Get rid of -L%libdir% from kakasi-config because it's a standard library
  directory. (#341691)
- Separate the shread library to kakasi-libs package.

kakasi-multilib.patch:

--- NEW FILE kakasi-multilib.patch ---
diff -ruN kakasi-2.3.4.orig/kakasi-config.in kakasi-2.3.4/kakasi-config.in
--- kakasi-2.3.4.orig/kakasi-config.in	2000-12-27 17:15:10.000000000 +0900
+++ kakasi-2.3.4/kakasi-config.in	2007-11-20 17:32:24.000000000 +0900
@@ -72,7 +72,7 @@
        	;;
 
     --libs)
-       	echo -L at libdir@ -lkakasi
+       	echo -lkakasi
        	;;
 
     *)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kakasi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 May 2005 02:09:48 -0000	1.2
+++ .cvsignore	20 Nov 2007 08:42:31 -0000	1.3
@@ -1 +1,4 @@
 kakasi-2.3.4.tar.bz2
+*rpm
+*bz2
+*gz


Index: kakasi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kakasi/devel/kakasi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kakasi.spec	23 Aug 2007 11:12:15 -0000	1.6
+++ kakasi.spec	20 Nov 2007 08:42:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		kakasi
 Version:	2.3.4
-Release:	24%{?dist}
+Release:	25%{?dist}
 URL:		http://kakasi.namazu.org/
 License:	GPLv2+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -11,9 +11,10 @@
 Patch1:		kakasi-2.3.4-fixdict.patch
 Patch2:		kakasi-2.3.4-arraysize.patch
 Patch3:		kakasi-2.3.4-fix-bad-source.patch
+Patch4:		kakasi-multilib.patch
 
 
-Summary:	A Japanese character set conversion filter.
+Summary:	A Japanese character set conversion filter
 Group:		Applications/Text
 
 %description
@@ -21,11 +22,18 @@
 Katakana characters, or into Romaji (phonetic transcription of
 Japanese pronunciation).
 
+%package libs
+Summary:	Libraries for KAKASI
+Group:		Development/Libraries
+Obsoletes:	%{name} < 2.3.4-25%{?dist}
+
+%description libs
+The kakasi-libs package contains the library file for KAKASI
 
 %package devel
-Summary:	Files for development of applications which will use KAKASI.
+Summary:	Files for development of applications which will use KAKASI
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
 The kakasi-devel package contains the header file and library for
@@ -34,9 +42,9 @@
 
 
 %package dict
-Summary:	The base dictionary for KAKASI.
+Summary:	The base dictionary for KAKASI
 Group:		Applications/Text
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	kakasidict
 
 %description dict
@@ -49,6 +57,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -61,6 +70,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# correct timestamp
+touch -r kakasi-config.in $RPM_BUILD_ROOT%{_bindir}/kakasi-config
+
 # remove the unnecesary files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -77,26 +89,38 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %lang(ja) %doc README-ja
 %dir %{_datadir}/kakasi
 %{_bindir}/*
-%{_libdir}/libkakasi.so.*
 %{_mandir}/ja/man1/kakasi.1.gz
 %{_datadir}/kakasi/itaijidict
 
+%files libs
+%defattr(-, root, root, -)
+%doc COPYING
+%{_libdir}/libkakasi.so.*
+
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
+%doc COPYING
 %{_libdir}/libkakasi.so
 %{_includedir}/libkakasi.h
 
 %files dict
-%defattr(-, root, root)
+%defattr(-, root, root, -)
+%doc COPYING
 %{_datadir}/kakasi/kanwadict
 
 
 %changelog
+* Tue Nov 20 2007 Akira TAGOH <tagoh at redhat.com> - 2.3.4-25
+- Clean up spec file.
+- Get rid of -L%libdir% from kakasi-config because it's a standard library
+  directory. (#341691)
+- Separate the shread library to kakasi-libs package.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 2.3.4-24
 - Rebuild