Accepting request 113078 from X11:common:Factory

license update: MIT and SUSE-Public-Domain
This is _not_ IBM Public License code.  (forwarded request 113073 from babelworx)

OBS-URL: https://build.opensuse.org/request/show/113078
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=30

baselibs.conf

@@ -1,2 +1,4 @@
-libicu
+libicu49
 libicu-devel
+	requires -libicu-<targettype>
+	requires "libicu49-<targettype> = <version>"

icu-rpmlint.diff

@@ -5,22 +5,24 @@ E: icu bufferoverflowstrncat pkgdata.cpp:299:87
 
 ---
  source/tools/pkgdata/pkgdata.cpp |    6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 Index: icu/source/tools/pkgdata/pkgdata.cpp
 ===================================================================
 --- icu.orig/source/tools/pkgdata/pkgdata.cpp
 +++ icu/source/tools/pkgdata/pkgdata.cpp
-@@ -1645,10 +1645,10 @@ static void loadLists(UPKGOptions *o, UE
+@@ -1914,12 +1914,12 @@ static void loadLists(UPKGOptions *o, UE
      const char cmd[] = "icu-config --incpkgdatafile";
  
      /* #1 try the same path where pkgdata was called from. */
 -    findDirname(progname, cmdBuf, 1024, &status);
 +    findDirname(progname, cmdBuf, sizeof(cmdBuf), &status);
      if(U_SUCCESS(status)) {
--      uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
+       if (cmdBuf[0] != 0) {
+-          uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
++          uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf));
+       }
 -      uprv_strncat(cmdBuf, cmd, 1024);
-+      uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf));
 +      uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf));
        
        if(verbose) {

icu.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Tue Apr 10 10:22:49 UTC 2012 - cfarrell@suse.com
+
+- license update: MIT and SUSE-Public-Domain
+  This is _not_ IBM Public License code. 
+
+-------------------------------------------------------------------
+Tue Apr  3 12:45:07 UTC 2012 - jengelh@medozas.de
+
+- Update to new upstream release 49.1:
+* Unicode 6.1: New scripts & blocks; changes to grapheme break &
+  line break property values; some characters change from symbol to
+  Po or No; etc.
+* CLDR 21.0.1: Changes in segmentation data to match Unicode 6.1;
+  new structures for support of Chinese calendar, for
+  context-dependent capitalization, for gender of lists of people,
+  for ordinal categories, and for multiple number systems per
+  locale; deprecation of "commonlyUsed" element in timezone names;
+  removal of "whole-locale" aliases; major cleanups of timezone
+  names, delimiter data, abbreviated number data.
+* Support for ISO 4217 numeric currency code
+* See http://site.icu-project.org/download/49 for more
+
+-------------------------------------------------------------------
+Sat Feb 25 14:57:50 UTC 2012 - jengelh@medozas.de
+
+- Use shlib policy for icu package
+- Use proper data directory in CXXFLAGS
+
 -------------------------------------------------------------------
 Wed Jan 18 12:14:28 UTC 2012 - vuntz@opensuse.org
 

icu.spec

@@ -15,25 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           icu
-Version:        4.8.1.1
+%define lname	libicu49
+Version:        49.1
 Release:        0
 Summary:        International Components for Unicode
-License:        IPL-1.0
+License:        MIT and SUSE-Public-Domain
 Group:          System/Libraries
 Url:            http://ibm.com/software/globalization/icu
-Source0:        icu4c-4_8_1_1-src.tgz
+Source0:        icu4c-49_1-src.tgz
-Source1:        icu4c-4_8_1_1-docs.zip
+Source1:        icu4c-49_1-docs.zip
 Source3:        SuSEconfig.icu
-# PATCH-FIX-UPSTREAM icu44-rpmlint.diff -- http://bugs.icu-project.org/trac/ticket/7808
+# PATCH-FIX-UPSTREAM icu-rpmlint.diff -- http://bugs.icu-project.org/trac/ticket/7808
-Patch1:         icu44-rpmlint.diff
+Patch1:         icu-rpmlint.diff
 # PATCH-FIX-OPENSUSE icu-remove-datetime.patch vuntz@novell.com -- Do not put date/time in icu-config (needed for build-compare)
 Patch99:        icu-remove-datetime.patch
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  unzip
-Requires:       libicu = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -52,7 +53,7 @@ This package contains the runtime libraries for ICU. It does not
 contain any of the data files needed at runtime and present in the icu
 and icu-locales packages.
 
-%package -n libicu
+%package -n %lname
 Summary:        International Components for Unicode (development files)
 Group:          Development/Libraries/C and C++
 # bug437293
@@ -60,22 +61,12 @@ Group:          Development/Libraries/C and C++
 Obsoletes:      libicu-64bit
 %endif
 Requires:       timezone
-#
-Provides:       libicu17
-Provides:       libicu22
-Provides:       libicu26
-Provides:       libicu30
-Provides:       libicu32
-Provides:       libicu34
 Obsoletes:      icu-i18ndata
-Obsoletes:      libicu17
+# Following O/P added in timeframe for 12.2
-Obsoletes:      libicu22
+Provides:       libicu = %version-%release
-Obsoletes:      libicu26
+Obsoletes:      libicu < %version-%release
-Obsoletes:      libicu30
-Obsoletes:      libicu32
-Obsoletes:      libicu34
 
-%description -n libicu
+%description -n %lname
 ICU is a set of C and C++ libraries that provides robust and
 full-featured Unicode support. This package contains the runtime
 libraries for ICU. It does not contain any of the data files needed at
@@ -89,7 +80,7 @@ Group:          Development/Libraries/C and C++
 Obsoletes:      libicu-devel-64bit
 %endif
 #
-Requires:       libicu = %{version}
+Requires:       %lname = %{version}
 
 %description -n libicu-devel
 ICU is a C++ and C library that provides robust and full-featured
@@ -103,12 +94,12 @@ Group:          Development/Libraries/C and C++
 ICU is a C++ and C library that provides robust and full-featured
 Unicode support. This package contains the html documentation.
 
-%package -n icu-data
+%package data
 Summary:        International Components for Unicode (Sources for the Data in ICU)
 Group:          System/Libraries
-Requires:       libicu >= %{version}
+Requires:       %lname >= %{version}
 
-%description -n icu-data
+%description data
 ICU is a C++ and C library that provides robust and full-featured
 Unicode support. This package contains the source files for the data
 found in the "icu" package.
@@ -117,7 +108,7 @@ This data describes the Unicode data (normative and informative) and
 also all the table-based converters provided in the ICU distribution.
 
 This package contains uncompiled source data. Precompiled data is in
-the `libicu%{version}' package.
+the "%lname" package.
 
 %prep
 %setup -q -n icu
@@ -131,15 +122,14 @@ popd
 %build
 cd source
 export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags} -DICU_DATA_DIR=\\\"/usr/share/icu/%{version}/\\\""
-export CXXFLAGS="$CXXFLAGS -DICU_DATA_DIR='/usr/share/icu/4.0/'"
 %configure --disable-static --with-pic\
     --enable-shared \
     --without-samples
 make %{?_smp_mflags}
 
 %install
-find . -name CVS -type d | xargs rm -rf
+find . -name CVS -type d -exec rm -Rf "{}" "+"
 cd source
 
 %make_install
@@ -168,12 +158,9 @@ cd source
 make check
 %endif
 
-%clean
+%post -n %lname -p /sbin/ldconfig
-rm -rf %{buildroot}
 
-%post -n libicu -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
-
-%postun -n libicu -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)
@@ -195,7 +182,7 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 /sbin/conf.d/SuSEconfig.icu
 
-%files -n libicu
+%files -n %lname
 %defattr(-, root, root)
 %attr (755, root, root) %{_libdir}/lib*.so.*
 
@@ -219,7 +206,7 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %doc html/
 
-%files -n icu-data
+%files data
 %defattr(-, root, root)
 %{_datadir}/icu/%{version}/unidata/
 %{_datadir}/icu/%{version}/UnicodeData.txt

icu4c-49_1-docs.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df8e333ac3022b43d18216d52b8b8be4735e0cfc09dc81dc77b3730b864b41e2
+size 4242056

icu4c-49_1-src.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6399f00941d982c64fef96b0094dd2f7c1421f8a0c113686d5f123daf8eabca
+size 19000749

icu4c-4_8_1_1-docs.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03bd6dd2f3a2482af471840462512af4217984688e6ff2a2686a97c3a1980c2a
-size 4078464

icu4c-4_8_1_1-src.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a70491c5fdfc5a0fa7429f820da73951e07d59a268b3d8ffe052eec65820ca1
-size 18675781