From 11fd60bc4f83c4bb1c2ae0cf90f040aa6b70db0313eed7e8dcb8fcbe95963c8b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Jun 2014 11:52:10 +0000 Subject: [PATCH] Run spec-beautifier OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=44 --- icu.spec | 156 +++++++++++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/icu.spec b/icu.spec index 9b0e8b5..c8dc8df 100644 --- a/icu.spec +++ b/icu.spec @@ -25,8 +25,8 @@ Summary: International Components for Unicode License: MIT Group: Development/Libraries/C and C++ Url: http://icu-project.org/ -Source: http://download.icu-project.org/files/icu4c/%version/icu4c-%{aversion}-src.tgz -Source2: http://download.icu-project.org/files/icu4c/%version/icu4c-%{aversion}-docs.zip +Source: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz +Source2: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-docs.zip Source3: sanitize_docs.sh Patch1: icu-rpmlint.diff Patch2: icu-remove-datetime.patch @@ -49,28 +49,28 @@ line, and sentence breaking, etc. This subpackage contains the runtime programs for interacting with ICU. -%package -n %{lname} +%package -n %lname Summary: International Components for Unicode Group: System/Libraries -Requires: libicu%{aversion}-data +Requires: libicu%aversion-data Requires: timezone # Following O/P added in timeframe for 12.2 -Provides: libicu = %{version} -Obsoletes: libicu < %{version} +Provides: libicu = %version +Obsoletes: libicu < %version -%description -n %{lname} +%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 which include precompiled locale data. -%package -n libicu%{aversion}-data +%package -n libicu%aversion-data Summary: International Components for Unicode Group: System/Libraries %if 0%{?suse_version} >= 1210 BuildArch: noarch %endif -%description -n libicu%{aversion}-data +%description -n libicu%aversion-data 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 which include precompiled locale data. @@ -81,7 +81,7 @@ most of the locale-specific information. %package -n libicu-devel Summary: International Components for Unicode (development files) Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %lname = %version %description -n libicu-devel ICU is a C++ and C library that provides robust and full-featured @@ -98,7 +98,7 @@ Unicode support. This package contains the html documentation. %package data Summary: International Components for Unicode (Sources for the Data in ICU) Group: System/Libraries -Requires: %{lname} >= %{version} +Requires: %lname >= %version %description data ICU is a C++ and C library that provides robust and full-featured @@ -115,14 +115,14 @@ This package contains uncompiled source data. # docs are special mkdir html cd html -unzip %{SOURCE2} +unzip %SOURCE2 cd .. %patch -P 1 -P 2 -P 3 -P 4 -p1 %build cd source -export CXXFLAGS="%{optflags} -DICU_DATA_DIR=\\\"%{_datadir}/icu/%{version}/\\\"" +export CXXFLAGS="%optflags -DICU_DATA_DIR=\\\"%_datadir/icu/%version/\\\"" export CFLAGS="$CXXFLAGS" %configure \ --disable-static \ @@ -132,21 +132,21 @@ export CFLAGS="$CXXFLAGS" make %{?_smp_mflags} VERBOSE=1 %install -mkdir -p "%{buildroot}/%{_docdir}/%{name}" -cp -a html "%{buildroot}/%{_docdir}/%{name}/" -cp -a license.html readme.html "%{buildroot}/%{_docdir}/%{name}/" +mkdir -p "%buildroot/%_docdir/%name" +cp -a html "%buildroot/%_docdir/%name/" +cp -a license.html readme.html "%buildroot/%_docdir/%name/" find . -name CVS -type d -exec rm -Rf "{}" "+" cd source -make install DESTDIR="%{buildroot}" +make install DESTDIR="%buildroot" # # ICU's "pkgdata" utility is really fragile, so icu-versioning.diff # does as few as possible, but that means we need some additional # cleanup in the spec file now. # -pushd "%{buildroot}/%{_libdir}/" +pushd "%buildroot/%_libdir/" for i in *.so.[0-9]*; do echo "Looking at $i" if [ "${i##*.so.}" != "%version" ]; then @@ -155,22 +155,22 @@ for i in *.so.[0-9]*; do fi # Because U_ICU_VERSION_SHORT is "51_2" and not "51.2", # create some symlinks. - ln -s "$i" "${i%%%version}%{aversion}" + ln -s "$i" "${i%%%version}%aversion" done popd # /usr/lib/rpm/elfdeps requires +x bit and not all had it at one point -chmod a+rx "%{buildroot}/%{_libdir}"/lib*.so.* +chmod a+rx "%buildroot/%_libdir"/lib*.so.* # install uncompiled source data: -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/%_datadir/icu/%version/unidata" +install -m 644 data/unidata/*.txt "%buildroot/%_datadir/icu/%version/unidata" +ln -s unidata/UnicodeData.txt "%buildroot/%_datadir/icu/%version/" -rm "%{buildroot}/%{_datadir}/icu/%{version}/license.html" -rm "%{buildroot}/%{_datadir}/icu/%{version}/install-sh" +rm "%buildroot/%_datadir/icu/%version/license.html" +rm "%buildroot/%_datadir/icu/%version/install-sh" -%fdupes %{buildroot}/%{_prefix} +%fdupes %buildroot/%_prefix %check cd source @@ -178,91 +178,91 @@ cd source # Checks disabled in qemu because of races happening when we emulate # multi-threaded programs, and some check tests atomic instructions in # multi-threaded icu invocations -ICU_DATA="%{buildroot}/%{_datadir}/icu/%{version}" make check %{?_smp_mflags} VERBOSE=1 +ICU_DATA="%buildroot/%_datadir/icu/%version" make check %{?_smp_mflags} VERBOSE=1 %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' | +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"; + 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' | +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"; + rm -f "%_libdir/icu/current"; + ln -sv "$current" "%_libdir/icu/current"; fi; fi; -%post -n %{lname} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) -%dir %{_libdir}/icu -%dir %{_libdir}/icu/%{version} -%{_libdir}/icu/current -%{_bindir}/derb -%{_bindir}/gen* -%{_bindir}/icuinfo -%{_bindir}/makeconv -%{_bindir}/pkgdata -%{_bindir}/uconv -%{_sbindir}/* -%{_mandir}/man*/* -%dir %{_docdir}/%{name}/ -%{_docdir}/%{name}/license.html -%{_docdir}/%{name}/readme.html +%dir %_libdir/icu +%dir %_libdir/icu/%version +%_libdir/icu/current +%_bindir/derb +%_bindir/gen* +%_bindir/icuinfo +%_bindir/makeconv +%_bindir/pkgdata +%_bindir/uconv +%_sbindir/* +%_mandir/man*/* +%dir %_docdir/%name/ +%_docdir/%name/license.html +%_docdir/%name/readme.html -%files -n %{lname} +%files -n %lname %defattr(-, root, root) -%{_libdir}/libicu*.so.* +%_libdir/libicu*.so.* -%files -n libicu%{aversion}-data +%files -n libicu%aversion-data %defattr(-,root,root) -%dir %{_datadir}/icu -%dir %{_datadir}/icu/%{version} -%{_datadir}/icu/%{version}/icudt5*[bl].dat +%dir %_datadir/icu +%dir %_datadir/icu/%version +%_datadir/icu/%version/icudt5*[bl].dat %files -n libicu-devel %defattr(-, root, root) -%{_libdir}/libicu*.so -%{_includedir}/unicode/ -%{_includedir}/layout/ -%dir %{_libdir}/icu/ -%dir %{_libdir}/icu/%{version}/ -%{_libdir}/icu/%{version}/Makefile.inc -%{_libdir}/icu/%{version}/pkgdata.inc -%{_libdir}/icu/Makefile.inc -%{_libdir}/icu/pkgdata.inc -%{_libdir}/pkgconfig/icu-*.pc -%{_bindir}/icu-config -%dir %{_datadir}/icu/ -%dir %{_datadir}/icu/%{version}/ -%{_datadir}/icu/%{version}/mkinstalldirs -%{_datadir}/icu/%{version}/config/ +%_libdir/libicu*.so +%_includedir/unicode/ +%_includedir/layout/ +%dir %_libdir/icu/ +%dir %_libdir/icu/%version/ +%_libdir/icu/%version/Makefile.inc +%_libdir/icu/%version/pkgdata.inc +%_libdir/icu/Makefile.inc +%_libdir/icu/pkgdata.inc +%_libdir/pkgconfig/icu-*.pc +%_bindir/icu-config +%dir %_datadir/icu/ +%dir %_datadir/icu/%version/ +%_datadir/icu/%version/mkinstalldirs +%_datadir/icu/%version/config/ %files -n libicu-doc %defattr(-,root,root) -%dir %{_docdir}/%{name}/ -%{_docdir}/%{name}/html/ +%dir %_docdir/%name/ +%_docdir/%name/html/ %files data %defattr(-, root, root) -%dir %{_datadir}/icu/ -%dir %{_datadir}/icu/%{version}/ -%{_datadir}/icu/%{version}/unidata/ -%{_datadir}/icu/%{version}/UnicodeData.txt +%dir %_datadir/icu/ +%dir %_datadir/icu/%version/ +%_datadir/icu/%version/unidata/ +%_datadir/icu/%version/UnicodeData.txt %changelog