baselibs.conf

@@ -1,4 +1,4 @@
-libicu76
+libicu75
 libicu-devel
 	requires -libicu-<targettype>
-	requires "libicu76-<targettype> = <version>"
+	requires "libicu75-<targettype> = <version>"

icu-error-reporting.diff

@@ -29,14 +29,14 @@ Index: icu/source/tools/toolutil/package.cpp
      }
  
 @@ -1169,7 +1170,7 @@ Package::extractItem(const char *filesPa
-     makeFullFilenameAndDirs(filesPath, outName, filename, static_cast<int32_t>(sizeof(filename)));
+     makeFullFilenameAndDirs(filesPath, outName, filename, (int32_t)sizeof(filename));
      file=fopen(filename, "wb");
      if(file==nullptr) {
 -        fprintf(stderr, "icupkg: unable to create file \"%s\"\n", filename);
 +        fprintf(stderr, "icupkg: unable to create file \"%s\": %s\n", filename, strerror(errno));
          exit(U_FILE_ACCESS_ERROR);
      }
-     fileLength = static_cast<int32_t>(fwrite(pItem->data, 1, pItem->length, file));
+     fileLength=(int32_t)fwrite(pItem->data, 1, pItem->length, file);
 Index: icu/source/tools/toolutil/writesrc.cpp
 ===================================================================
 --- icu.orig/source/tools/toolutil/writesrc.cpp

icu-fix-install-mode-files.diff

@@ -24,8 +24,8 @@ Index: icu/source/data/Makefile.in
 ===================================================================
 --- icu.orig/source/data/Makefile.in
 +++ icu/source/data/Makefile.in
-@@ -169,16 +169,16 @@ endif
+@@ -178,16 +178,16 @@ endif
- install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata
+ install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL)
  	$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR)
  ifeq ($(PKGDATA_MODE),files)
 -	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)

icu.changes

@@ -1,20 +1,3 @@
--------------------------------------------------------------------
-Sat Oct 26 22:43:42 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 76.1
-  * Unicode 16 support:
-  * Adds five modern-use scripts: Garay, Gurung Khema, Kirat Rai, Ol Onal, Sunuwar
-  * Adds two historic scripts & almost 4000 additional Egyptian Hieroglyphs
-  * Over 700 symbols from legacy computing environments
-  * ICU 76 adds support for the new UCD properties Modifier_Combining_Mark
-    and Indic_Conjunct_Break
-  * CLDR 46 support:
-  * Locales which are now at modern coverage level: Nigerian
-    Pidgin, Tigrinya
-  * Locales which are now at moderate coverage level: Akan,
-    Baluchi (Latin), Kangri, Tajik, Tatar, Wolof
-  * Collation: Significant changes to the CLDR root collation
-
 -------------------------------------------------------------------
 Thu Apr 25 13:52:08 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

icu.spec

@@ -16,14 +16,9 @@
 #
 
 
-# what icu thinks the package is
+%define lname	libicu75
-%define amajor 76
+%define amajor   75
-%define aversion 76.1
+%define aversion 75
-# for the rare case that SUSE needs to workaround ABI breaks:
-%define sonum %amajor
-# like sonum, but with underscore
-%define lname libicu%amajor
-
 %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k
 %define be_platform 1
 %else
@@ -31,16 +26,16 @@
 %endif
 # icu-versioning.diff needs update for new Version too
 Name:           icu
-Version:        76.1
+Version:        75.1
 Release:        0
 Summary:        International Components for Unicode
 License:        ICU
 Group:          Development/Libraries/C and C++
 URL:            https://icu.unicode.org/
-Source:         https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-src.tgz
+Source:         https://github.com/unicode-org/icu/releases/download/release-75-1/icu4c-75_1-src.tgz
-Source2:        https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-src.tgz.asc
+Source2:        https://github.com/unicode-org/icu/releases/download/release-75-1/icu4c-75_1-src.tgz.asc
-Source3:        https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-docs.zip
+Source3:        https://github.com/unicode-org/icu/releases/download/release-75-1/icu4c-75_1-docs.zip
-Source4:        https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-docs.zip.asc
+Source4:        https://github.com/unicode-org/icu/releases/download/release-75-1/icu4c-75_1-docs.zip.asc
 Source5:        %name.keyring
 Source100:      baselibs.conf
 Patch4:         icu-fix-install-mode-files.diff
@@ -53,7 +48,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  python3-base
 BuildRequires:  unzip
-Provides:       bundled(timezone) = 2024b
+Provides:       bundled(timezone) = 2024a
 
 %description
 ICU is a set of C and C++ libraries that provide extensive Unicode and locale
@@ -71,9 +66,9 @@ Group:          System/Libraries
 Requires:       timezone
 Provides:       libicu = %version
 %if %be_platform
-Requires:       libicu%sonum-bedata = %version
+Requires:       libicu%aversion-bedata = %version
 %else
-Requires:       libicu%sonum-ledata = %version
+Requires:       libicu%aversion-ledata = %version
 %endif
 
 %description -n %lname
@@ -81,12 +76,12 @@ ICU is a set of C and C++ libraries that provide extensive Unicode
 and locale support.
 This package contains the runtime libraries for ICU.
 
-%package -n libicu%sonum-bedata
+%package -n libicu%aversion-bedata
 Summary:        Rule databases and tables for ICU
 Group:          System/Libraries
 BuildArch:      noarch
 
-%description -n libicu%sonum-bedata
+%description -n libicu%aversion-bedata
 ICU is a set of C and C++ libraries that provide extensive Unicode
 and locale support.
 
@@ -96,12 +91,12 @@ rules, break iterator rules and dictionaries.
 
 This subpackage contains these data tables, in big-endian format.
 
-%package -n libicu%sonum-ledata
+%package -n libicu%aversion-ledata
 Summary:        Rule databases and tables for ICU
 Group:          System/Libraries
 BuildArch:      noarch
 
-%description -n libicu%sonum-ledata
+%description -n libicu%aversion-ledata
 ICU is a set of C and C++ libraries that provide extensive Unicode
 and locale support.
 
@@ -162,41 +157,58 @@ LD_LIBRARY_PATH="../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH" \
 popd
 
 %install
-b="%buildroot"
+mkdir -p "%buildroot/%_docdir/%name"
-mkdir -p "$b/%_docdir/%name"
+cp -a html "%buildroot/%_docdir/%name/"
-cp -a html "$b/%_docdir/%name/"
+cp -a license.html readme.html "%buildroot/%_docdir/%name/"
-cp -a license.html readme.html "$b/%_docdir/%name/"
 
 find . -name CVS -type d -exec rm -Rf "{}" "+"
 cd source
 
 %make_install
-cp data/out/icudt*.dat "$b/%_datadir/icu/%aversion/"
+cp data/out/icudt*.dat "%buildroot/%_datadir/icu/%version/"
+
+#
+# ICU's "pkgdata" utility is really fragile, so icu-versioning.diff
+# does as few actions as possible, but that means we need some additional
+# cleanup in the spec file now.
+#
+pushd "%buildroot/%_libdir/"
+for i in *.so.[0-9]*; do
+	echo "Looking at $i"
+	if [ "${i##*.so.}" != "%version" ]; then
+		rm -fv "$i"
+		continue
+	fi
+	# Because U_ICU_VERSION_SHORT is "51_2" and not "51.2",
+	# create some symlinks.
+	ln -s "$i" "${i%%%version}%aversion"
+done
+popd
 
 # /usr/lib/rpm/elfdeps requires +x bit and not all files had it at one point.
 # - OpenBSD for example is known to have patched their libtool program
 # to kill the x bit on install :(
-chmod a+rx "$b/%_libdir"/lib*.so.*
+chmod a+rx "%buildroot/%_libdir"/lib*.so.*
 
 # install uncompiled source data:
-mkdir -p "$b/%_datadir/icu/%aversion/unidata"
+mkdir -p "%buildroot/%_datadir/icu/%version/unidata"
-install -m 644 data/unidata/*.txt "$b/%_datadir/icu/%aversion/unidata"
+install -m 644 data/unidata/*.txt "%buildroot/%_datadir/icu/%version/unidata"
-ln -s unidata/UnicodeData.txt "$b/%_datadir/icu/%aversion/"
+ln -s unidata/UnicodeData.txt "%buildroot/%_datadir/icu/%version/"
 
-rm "$b/%_datadir/icu/%aversion/install-sh"
+rm "%buildroot/%_datadir/icu/%version/install-sh"
 # Seems unused
-rm -Rf "$b/%_datadir/icu/%aversion/unidata/" \
+rm -Rf "%buildroot/%_datadir/icu/%version/unidata/" \
-	"$b/%_datadir/icu/%aversion/UnicodeData.txt" \
+	"%buildroot/%_datadir/icu/%version/UnicodeData.txt" \
-	"$b/%_libdir/icu/current" \
+	"%buildroot/%_libdir/icu/current" \
-	"$b/%_libdir/icu/Makefile.inc" \
+	"%buildroot/%_libdir/icu/Makefile.inc" \
-	"$b/%_libdir/icu/pkgdata.inc"
+	"%buildroot/%_libdir/icu/pkgdata.inc"
 
 %fdupes %buildroot/%_prefix
 
 %check
 # s390x see: https://ssl.icu-project.org/trac/ticket/13095
 cd source
-if ! ICU_DATA="%buildroot/%_datadir/icu/%aversion" %make_build check VERBOSE=1; then
+if ! ICU_DATA="%buildroot/%_datadir/icu/%version" %make_build check VERBOSE=1; then
 	# oddly fails since 74
 	# did they mess up --with-data-packaging=archive
 	:
@@ -215,8 +227,8 @@ fi
 %_sbindir/*
 %_mandir/man*/*
 %dir %_datadir/icu
-%dir %_datadir/icu/%aversion
+%dir %_datadir/icu/%version
-%_datadir/icu/%aversion/LICENSE
+%_datadir/icu/%version/LICENSE
 %dir %_docdir/%name/
 %_docdir/%name/license.html
 %_docdir/%name/readme.html
@@ -224,29 +236,29 @@ fi
 %files -n %lname
 %_libdir/libicu*.so.*
 
-%files -n libicu%sonum-bedata
+%files -n libicu%aversion-bedata
 %dir %_datadir/icu
-%dir %_datadir/icu/%aversion
+%dir %_datadir/icu/%version
-%_datadir/icu/%aversion/icudt%{amajor}b.dat
+%_datadir/icu/%version/icudt%{amajor}b.dat
 
-%files -n libicu%sonum-ledata
+%files -n libicu%aversion-ledata
 %dir %_datadir/icu
-%dir %_datadir/icu/%aversion
+%dir %_datadir/icu/%version
-%_datadir/icu/%aversion/icudt%{amajor}l.dat
+%_datadir/icu/%version/icudt%{amajor}l.dat
 
 %files -n libicu-devel
 %_libdir/libicu*.so
 %_includedir/unicode/
 %dir %_libdir/icu/
-%dir %_libdir/icu/%aversion/
+%dir %_libdir/icu/%version/
-%_libdir/icu/%aversion/Makefile.inc
+%_libdir/icu/%version/Makefile.inc
-%_libdir/icu/%aversion/pkgdata.inc
+%_libdir/icu/%version/pkgdata.inc
 %_libdir/pkgconfig/icu-*.pc
 %_bindir/icu-config
 %dir %_datadir/icu/
-%dir %_datadir/icu/%aversion/
+%dir %_datadir/icu/%version/
-%_datadir/icu/%aversion/mkinstalldirs
+%_datadir/icu/%version/mkinstalldirs
-%_datadir/icu/%aversion/config/
+%_datadir/icu/%version/config/
 
 %files -n libicu-doc
 %dir %_docdir/%name/

icu4c-75_1-docs.zip

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

icu4c-75_1-docs.zip.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEEPaNTAafDMCV7h1V1QFj2dAbqpqsFAmYe92gACgkQQFj2dAbq
+pqs+Wwv/TWn2FdngCmo2sLH+/sUTHuFVHe2Kc75SXPPwMEU8EycdXZpONZG8zyPx
+DRJu0LJEBRQUulH3UAm7dIZHgygPc1SXa9NfbO4VCSy4q2gxHsRRmv83K3jZTpE6
+jqgiY78NbvXizaxwCCdBrKFrVD/V98Ez7+AFt0e/uot+T9l/Go+E7MBg2PRsRxi6
+iPyx13DluAQ594Lp2z2SxO1JiueN7IvK1lYK+5fPG+XcYupaedVVA75mXwo8z0au
+wp2HPDYFIGdAwYI3yOSSfdrKWID8V1dbZWvNIFxLsLn9ihMrx78YrBbpbjcx46pF
+/WJc7dMW9TUh3/oB0eYSw1MkrhO3IzabFOFb2bv7klR4mV6SMkaDjik1/WLbGqMz
+fAdxag0ClCJDV8FS70WxgfL6zTPlXgQsr83ud3mGJcncTVQFkpVEiSudpg46aIZH
+g7UbPeRtwkDivmUjsvoubwj5sh9upQM30HSYEKKTsZHgWGjTlTzEZE/A5+dDjvFS
+jKAAxMA6
+=NL/S
+-----END PGP SIGNATURE-----

icu4c-75_1-src.tgz

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

icu4c-75_1-src.tgz.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEEPaNTAafDMCV7h1V1QFj2dAbqpqsFAmYe924ACgkQQFj2dAbq
+pqtdDQwAtkdxUaFTYGOO97bDj0TtGWAtTJa5os1UObJnrrqmRv3NMcrvVSLA+dnA
+MU8okInvqks8fradtPfTwylh3fNQfTJPEKmHTf6e2izva6F1n8a8ugpEmI2p633O
+N0UkgU7Y1TsGC0qw5U38Qu5tINSxpXZmiobsjqTDPoAev4NeTqWmTVFSM/lKeYYD
+w+zxRuI/rbcCu3qnc0LyAekN5GC+r/hqKn9Kh3hqrpP2MfSZKsuhG3KDjIzcPln0
+R4xUD/llRBM7hSfSlFJmD+x59yxkhB+JBKBIBbyuPGNChHW9Xk+21Z7lFaLox+SN
+YYD4W7Uq2brdfjhTiRcpT3+Uqym4Rw4eVDYAH7TbPlcy3K60PZArFsnEmaJycYvy
+i/tyalrUjzBX48AoQiB8me2wXkL7g/eFzqn/4P0auwqZ94gwh4TWebQp4Oti2HNw
+hGBk0cEVoxWlszQZ9UHim76K9P2zxNZilxKcvlK43OPcZA5Ki0BX3fxHgxz+qEjI
++nYOQ/1S
+=QxoD
+-----END PGP SIGNATURE-----

icu4c-76_1-docs.zip.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYIAB0WIQTlLweHelgF+a9KsKzUbFYQ0G5wAQUCZxqS3gAKCRDUbFYQ0G5w
-AbaJAQDMJAyiZsnDXf77p1tvatp9kEHiDe+ro+d+k5j19oDkSAD/SFWGaO7xLg5Y
-jC807r6a25LvW9nYbyPL40I5gyISegw=
-=QLcV
------END PGP SIGNATURE-----

icu4c-76_1-src.tgz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYIAB0WIQTlLweHelgF+a9KsKzUbFYQ0G5wAQUCZxqS2gAKCRDUbFYQ0G5w
-ATvVAQCbJYfxkXq+A06gGuF64rHLOgM+zXzpAuZe8a5l6YITzQEAs9soTU1H4JIs
-7P+OcoG0NzAsCE2PLLvUSWbWY4yHhgQ=
-=qcoz
------END PGP SIGNATURE-----