[mingw-icu] Fix packaging of icudata.dll file

pfor pfor at fedoraproject.org
Sun Jan 27 15:43:04 UTC 2013


commit 72815608f64e0ffd0efd583e80286e21cbb6ae46
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Sun Jan 27 16:41:30 2013 +0100

    Fix packaging of icudata.dll file

 mingw-icu.spec |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/mingw-icu.spec b/mingw-icu.spec
index a7caa6f..d9e348c 100644
--- a/mingw-icu.spec
+++ b/mingw-icu.spec
@@ -5,7 +5,7 @@
 
 Name:           mingw-icu
 Version:        49.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW compilation of International Components for Unicode Tools
 
 License:        MIT and UCD and Public Domain
@@ -107,32 +107,26 @@ pushd source
 %mingw_make DESTDIR=$RPM_BUILD_ROOT install
 popd
 
-# UGLY HACKS RESTARTING
-
 find $RPM_BUILD_ROOT -name "*.dll" -type l -delete
 
-rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/libicudata%{version}.dll
-rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/libicudata%{version}.dll
-
-mv $RPM_BUILD_ROOT%{mingw32_libdir}/libicudata%{version}.dll \
-        $RPM_BUILD_ROOT%{mingw32_bindir}/icudata%{lib_version}.dll
-mv $RPM_BUILD_ROOT%{mingw64_libdir}/libicudata%{version}.dll \
-        $RPM_BUILD_ROOT%{mingw64_bindir}/icudata%{lib_version}.dll
 
 for i in $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll ; \
         do mv $i $RPM_BUILD_ROOT%{mingw32_bindir}/; done
 for i in $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll ; \
         do mv $i $RPM_BUILD_ROOT%{mingw64_bindir}/; done
 
+mv $RPM_BUILD_ROOT%{mingw32_bindir}/libicudata%{version}.dll \
+        $RPM_BUILD_ROOT%{mingw32_bindir}/icudata%{lib_version}.dll
+mv $RPM_BUILD_ROOT%{mingw64_bindir}/libicudata%{version}.dll \
+        $RPM_BUILD_ROOT%{mingw64_bindir}/icudata%{lib_version}.dll
+
 sed -i -e 's,default_ENABLE_RPATH=.*,default_ENABLE_RPATH="N",' -e 's,^SO=.*$,SO="dll",' $RPM_BUILD_ROOT%{mingw32_bindir}/icu-config
 sed -i -e 's,default_ENABLE_RPATH=.*,default_ENABLE_RPATH="N",' -e 's,^SO=.*$,SO="dll",' $RPM_BUILD_ROOT%{mingw64_bindir}/icu-config
 
-# UGLY HACKS ENDING AGAIN
-
+# remove unneded files
 rm -fr $RPM_BUILD_ROOT%{mingw32_mandir}
 rm -fr $RPM_BUILD_ROOT%{mingw64_mandir}
 
-# remove dangling pointers
 rm -fr $RPM_BUILD_ROOT%{mingw32_libdir}/icu/Makefile.inc
 rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/Makefile.inc
 rm -fr $RPM_BUILD_ROOT%{mingw32_libdir}/icu/pkgdata.inc
@@ -237,6 +231,9 @@ rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/pkgdata.inc
 
 
 %changelog
+* Sun Jan 27 2013 Paweł Forysiuk <tuxator at o2.pl> - 49.1.2-2
+- Properly package icudata library
+
 * Sun Dec 30 2012 Pawel Forysiuk <tuxator at o2.pl> - 49.1.2-1
 - Update to new upstream version
 


More information about the scm-commits mailing list