Accepting request 127783 from X11:common:Factory

- Remove SuSEconfig.icu; only run the link updater on icu updates
  (FATE#313539)

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

SuSEconfig.icu

@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany.  All rights reserved.
-#
-# Author: Mike Fabian <mfabian@suse.de>, 2000
-#
-
-
-for iculibdir in $(echo /usr/lib*/icu/ )
-do
-    echo "Adjust the current ICU link in $iculibdir ..."
-
-    icucurrent=`2>/dev/null ls -dp ${iculibdir}/* | sed -n 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
-    cd $iculibdir
-    rm -f current
-    if test x"$icucurrent" != x
-    then
-	ln -s "$icucurrent" current
-    fi
-done

icu.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Jul 11 21:35:12 UTC 2012 - jengelh@inai.de
+
+- Remove SuSEconfig.icu; only run the link updater on icu updates
+  (FATE#313539)
+
+-------------------------------------------------------------------
+Wed Jun 13 12:34:53 UTC 2012 - cfarrell@suse.com
+
+- license update: SUSE-XFree86-1.0
+  The license (as stated in the license.html page) is not upstream at
+  http://www.spdx.org/licenses yet - thus, use this version (with SUSE-
+  proprietary prefix until the license goes upstream)
+
 -------------------------------------------------------------------
 Tue Apr 10 10:22:49 UTC 2012 - cfarrell@suse.com
 

icu.spec

@@ -21,12 +21,11 @@ Name:           icu
 Version:        49.1
 Release:        0
 Summary:        International Components for Unicode
-License:        MIT and SUSE-Public-Domain
+License:        SUSE-XFree86-1.0
 Group:          System/Libraries
 Url:            http://ibm.com/software/globalization/icu
 Source0:        icu4c-49_1-src.tgz
 Source1:        icu4c-49_1-docs.zip
-Source3:        SuSEconfig.icu
 # PATCH-FIX-UPSTREAM icu-rpmlint.diff -- http://bugs.icu-project.org/trac/ticket/7808
 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)
@@ -142,10 +141,6 @@ mkdir -p %{buildroot}%{_datadir}/icu/%{version}/unidata
 install -m 644 data/unidata/*.txt %{buildroot}/%{_datadir}/icu/%{version}/unidata
 ln -s unidata/UnicodeData.txt %{buildroot}/%{_datadir}/icu/%{version}/
 
-mkdir -p %{buildroot}/sbin/conf.d/
-sed -e "s/@ICUVERSION@/%{version}/g" < ${RPM_SOURCE_DIR}/SuSEconfig.icu > ./SuSEconfig.icu
-install -m 755 ./SuSEconfig.icu %{buildroot}/sbin/conf.d/
-
 rm %{buildroot}/%{_datadir}/icu/%{version}/license.html
 rm %{buildroot}/%{_datadir}/icu/%{version}/install-sh
 
@@ -158,6 +153,28 @@ cd source
 make check
 %endif
 
+# This should be run by whatever owns /usr/lib64/icu -
+# the (main) package in this case
+%post
+if test -d "%_libdir/icu"; then
+	current=$(cd %_libdir/icu; find [0-9]* -maxdepth 1 -type d -printf '%f\n' |
+		sort -V | tail -n1);
+	if test -n "$current"; then
+		rm -f "%_libdir/icu/current";
+		ln -sv "$current" "%_libdir/icu/current";
+	fi;
+fi;
+
+%postun
+if test -d "%_libdir/icu"; then
+	current=$(cd %_libdir/icu; find [0-9]* -maxdepth 1 -type d -printf '%f\n' |
+		sort -V | tail -n1);
+	if test -n "$current"; then
+		rm -f "%_libdir/icu/current";
+		ln -sv "$current" "%_libdir/icu/current";
+	fi;
+fi;
+
 %post -n %lname -p /sbin/ldconfig
 
 %postun -n %lname -p /sbin/ldconfig
@@ -180,7 +197,6 @@ make check
 %{_bindir}/uconv
 %{_sbindir}/*
 %{_mandir}/*/*
-/sbin/conf.d/SuSEconfig.icu
 
 %files -n %lname
 %defattr(-, root, root)