[sword-cvs] icu-sword/packaging/rpm icu.spec,1.3,1.4

sword@www.crosswire.org sword@www.crosswire.org
Tue, 6 Apr 2004 03:11:28 -0700


Update of /cvs/core/icu-sword/packaging/rpm
In directory www:/tmp/cvs-serv8911/packaging/rpm

Modified Files:
	icu.spec 
Log Message:
ICU 2.8 sync

Index: icu.spec
===================================================================
RCS file: /cvs/core/icu-sword/packaging/rpm/icu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- icu.spec	10 Sep 2003 02:42:01 -0000	1.3
+++ icu.spec	6 Apr 2004 10:07:56 -0000	1.4
@@ -9,14 +9,14 @@
 # This file can be freely redistributed under the same license as ICU.
 
 Name: icu
-Version: 2.6
+Version: 2.6.1
 Release: 1
-Requires: libicu26 >= 2.6
+Requires: libicu26 >= 2.6.1
 Summary: International Components for Unicode
 Packager: Ian Holsman (CNET Networks) <ianh@cnet.com>
 Copyright: X License
 Group: System Environment/Libraries
-Source: icu-2.6.tar.gz
+Source: icu-2.6.1.tar.gz
 BuildRoot: /var/tmp/%{name}
 %description
 ICU is a C++ and C library that provides robust and full-featured Unicode
@@ -36,7 +36,7 @@
 %package -n libicu-devel
 Summary: International Components for Unicode (development files)
 Group: Development/Libraries
-Requires: libicu26 = 2.6
+Requires: libicu26 = 2.6.1
 %description -n libicu-devel
 ICU is a C++ and C library that provides robust and full-featured Unicode
 support. This package contains the development files for ICU.
@@ -44,7 +44,7 @@
 %package locales
 Summary: Locale data for ICU
 Group: System Environment/Libraries
-Requires: libicu26 >= 2.6
+Requires: libicu26 >= 2.6.1
 %description locales
 The locale data are used by ICU to provide localization (l10n) and
 internationalization (i18n) support to ICU applications. This package
@@ -61,7 +61,7 @@
     ln -s "$icucurrent" current
 fi
 
-ICU_DATA=/usr/lib/icu/2.6
+ICU_DATA=/usr/lib/icu/2.6.1
 export ICU_DATA
 if test ! -f $ICU_DATA/cnvalias.dat -o /etc/icu/convrtrs.txt -nt $ICU_DATA/cnvalias.dat
 then
@@ -72,7 +72,7 @@
 %preun
 # Adjust the current ICU link in /usr/lib/icu
 
-icucurrent=`2>/dev/null ls -dp /usr/lib/icu/* | sed -n -e '/\/2.6\//d' -e 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
+icucurrent=`2>/dev/null ls -dp /usr/lib/icu/* | sed -n -e '/\/2.6.1\//d' -e 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
 cd /usr/lib/icu
 rm -f /usr/lib/icu/current
 if test x"$icucurrent" != x
@@ -96,7 +96,7 @@
 %preun -n libicu26
 # Adjust the current ICU link in /usr/lib/icu
 
-icucurrent=`2>/dev/null ls -dp /usr/lib/icu/* | sed -n -e '/\/2.6\//d' -e 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
+icucurrent=`2>/dev/null ls -dp /usr/lib/icu/* | sed -n -e '/\/2.6.1\//d' -e 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
 cd /usr/lib/icu
 rm -f /usr/lib/icu/current
 if test x"$icucurrent" != x
@@ -111,7 +111,7 @@
 cd source
 chmod a+x ./configure
 CFLAGS="-O3" CXXFLAGS="-O" ./configure --prefix=/usr --sysconfdir=/etc --with-data-packaging=files  --enable-shared --enable-static --disable-samples
-echo 'CPPFLAGS += -DICU_DATA_DIR=\"/usr/lib/icu/2.6\"' >> icudefs.mk
+echo 'CPPFLAGS += -DICU_DATA_DIR=\"/usr/lib/icu/2.6.1\"' >> icudefs.mk
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
 %install
@@ -119,8 +119,8 @@
 cd source
 make install DESTDIR=$RPM_BUILD_ROOT
 # static causes a static icudata lib to be built... - it's not needed, remove it.
-##cp stubdata/libicudata.a $RPM_BUILD_ROOT/usr/lib/icu/2.6/
-rm -f $RPM_BUILD_ROOT/usr/lib/icu/2.6/libicudata.a
+##cp stubdata/libicudata.a $RPM_BUILD_ROOT/usr/lib/icu/2.6.1/
+rm -f $RPM_BUILD_ROOT/usr/lib/icu/2.6.1/libicudata.a
 
 
 %files
@@ -128,9 +128,10 @@
 %doc readme.html
 %doc license.html
 %config /etc/icu/convrtrs.txt
-/usr/share/icu/2.6/README
-/usr/lib/icu/2.6/*.cnv
-/usr/lib/icu/2.6/*.icu
+/usr/share/icu/2.6.1/README
+/usr/share/icu/2.6.1/license.html
+/usr/lib/icu/2.6.1/*.cnv
+/usr/lib/icu/2.6.1/*.icu
 
 /usr/bin/derb
 /usr/bin/gencnval
@@ -151,7 +152,7 @@
 /usr/sbin/gentz
 /usr/sbin/genuca
 /usr/sbin/genidna
-/usr/share/icu/2.6/mkinstalldirs
+/usr/share/icu/2.6.1/mkinstalldirs
 
 /usr/man/man1/gencnval.1.gz
 /usr/man/man1/genrb.1.gz
@@ -171,24 +172,24 @@
 /usr/man/man8/genidna.8.gz
 
 %files -n icu-locales
-/usr/lib/icu/2.6/*.brk
-/usr/lib/icu/2.6/*.res
+/usr/lib/icu/2.6.1/*.brk
+/usr/lib/icu/2.6.1/*.res
 %files -n libicu26
 %doc license.html
 /usr/lib/libicui18n.so.26
-/usr/lib/libicui18n.so.26.0
+/usr/lib/libicui18n.so.26.1
 /usr/lib/libicutoolutil.so.26
-/usr/lib/libicutoolutil.so.26.0
+/usr/lib/libicutoolutil.so.26.1
 /usr/lib/libicuuc.so.26
-/usr/lib/libicuuc.so.26.0
+/usr/lib/libicuuc.so.26.1
 /usr/lib/libicudata.so.26
-/usr/lib/libicudata.so.26.0
+/usr/lib/libicudata.so.26.1
 /usr/lib/libicuio.so.26
-/usr/lib/libicuio.so.26.0
+/usr/lib/libicuio.so.26.1
 /usr/lib/libiculx.so.26
-/usr/lib/libiculx.so.26.0
+/usr/lib/libiculx.so.26.1
 /usr/lib/libicule.so.26
-/usr/lib/libicule.so.26.0
+/usr/lib/libicule.so.26.1
 
 %files -n libicu-devel
 %doc readme.html
@@ -209,13 +210,15 @@
 /usr/lib/libiculx.a
 /usr/include/unicode/*.h
 /usr/include/layout/*.h
-/usr/lib/icu/2.6/Makefile.inc
+/usr/lib/icu/2.6.1/Makefile.inc
 /usr/lib/icu/Makefile.inc
-/usr/share/icu/2.6/config
-/usr/share/icu/2.6/README
-/usr/share/doc/icu-2.6/*
+/usr/share/icu/2.6.1/config
+/usr/share/icu/2.6.1/README
+/usr/share/doc/icu-2.6.1/*
 
 %changelog
+* Tue Aug 16 2003 Steven Loomis <srl@jtcsv.com>
+- update to 2.6.1 - include license
 * Thu Jun 05 2003 Steven Loomis <srl@jtcsv.com>
 - Update to 2.6
 * Fri Dec 27 2002 Steven Loomis <srl@jtcsv.com>