From e92c7bbe7582c04a087b63cc84ea46ca53fad603 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mar 26 2013 07:05:35 +0000 Subject: Rebuilt for aarch64 support (#925129) --- diff --git a/Canna.spec b/Canna.spec index 2396e52..e7cd0c1 100644 --- a/Canna.spec +++ b/Canna.spec @@ -10,7 +10,7 @@ Summary: A Japanese character set input system. Name: Canna Version: 3.7p3 -Release: 37%{?dist} +Release: 38%{?dist} # lib/RKindep/cksum.c is licensed under 4-clause BSD, otherwise MIT. License: MIT and BSD with advertising Group: System Environment/Libraries @@ -48,8 +48,8 @@ Patch41: Canna-3.7p3-yenbs.patch Patch42: Canna-3.7p3-redecl.patch Patch43: Canna-3.7p3-fix-gcc4-warning.patch Patch44: Canna-3.7p3-no-strip.patch +Patch50: %{name}-aarch64.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): shadow-utils Requires(post): /bin/grep /etc/services /sbin/chkconfig %{__chown} systemd-units Requires(preun): /sbin/service systemd-units @@ -107,6 +107,7 @@ cd %{cannadir} %patch43 -p1 -b .gcc4 %patch44 -p1 -b .no-strip cd .. +%patch50 -p1 -b .aarch64 for file in %{cannadir}/{cmd/mkromdic/mkromdic.man,lib/RK/RkIntro.man}; do iconv -f euc-jp -t utf-8 < "$file" > "${file}_" @@ -199,8 +200,6 @@ builddic sup.ctd mwd sort cd .. %install -rm -rf $RPM_BUILD_ROOT - cd %{cannadir} make libCannaDir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} MANSUFFIX=1 LIBMANSUFFIX=3 install.man @@ -262,9 +261,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/.iroha_unix # remove the static libraries rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a -%clean -rm -fr $RPM_BUILD_ROOT - %triggerun -- Canna < 3.7p3-33 /usr/bin/systemd-sysv-convert --save canna >/dev/null 2>&1 || : @@ -295,7 +291,6 @@ fi %postun libs -p /sbin/ldconfig %files -%defattr (-,root,root,-) %lang(ja) %doc %{cannadir}/CHANGES.jp %{cannadir}/OCHANGES.jp %lang(ja) %doc %{cannadir}/README.jp %{cannadir}/RKCCONF.jp %{cannadir}/WHATIS.jp %doc %{cannadir}/ChangeLog %{cannadir}/README %{cannadir}/WHATIS @@ -321,7 +316,6 @@ fi %{_unitdir}/canna.service %files devel -%defattr (-,root,root,-) %{_includedir}/canna/ %{_mandir}/man3/* %lang(ja) %{_mandir}/ja/man3/* @@ -332,13 +326,15 @@ fi %files libs -%defattr (-,root,root,-) %{_libdir}/libRKC.so.* %{_libdir}/libRKC16.so.* %{_libdir}/libcanna.so.* %{_libdir}/libcanna16.so.* %changelog +* Tue Mar 26 2013 Akira TAGOH - 3.7p3-38 +- Rebuilt for aarch64 support (#925129) + * Wed Feb 13 2013 Fedora Release Engineering - 3.7p3-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild