Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2019-11-10 22:42:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/canna (Old) and /work/SRC/openSUSE:Factory/.canna.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "canna" Sun Nov 10 22:42:09 2019 rev:38 rq:746726 version:3.7p3 Changes: -------- --- /work/SRC/openSUSE:Factory/canna/canna.changes 2018-02-20 17:59:45.580345514 +0100 +++ /work/SRC/openSUSE:Factory/.canna.new.2990/canna.changes 2019-11-10 22:42:09.233457779 +0100 @@ -1,0 +2,7 @@ +Sat Nov 9 03:07:27 UTC 2019 - Marguerite Su <[email protected]> + +- ran spec-cleaner +- do not install static archive into -devel package +- put devel file lib*.so in -devel package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ canna.spec ++++++ --- /var/tmp/diff_new_pack.tJels1/_old 2019-11-10 22:42:10.209459046 +0100 +++ /var/tmp/diff_new_pack.tJels1/_new 2019-11-10 22:42:10.213459051 +0100 @@ -1,7 +1,7 @@ # # spec file for package canna # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,38 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: canna -BuildRequires: automake -BuildRequires: gcc -BuildRequires: imake -BuildRequires: ncurses-devel -BuildRequires: pwdutils -BuildRequires: termcap -Requires(pre): /usr/sbin/useradd -Requires(pre): /usr/sbin/groupadd -Requires(pre): /bin/rm -%if %suse_version < 1230 -Requires(pre): %insserv_prereq -%else -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} -%endif -#BuildPrereq: termcap -Recommends: cannadic Version: 3.7p3 Release: 0 -# http://canna.sourceforge.jp/ -Url: http://www.nec.co.jp/japanese/product/computer/soft/canna/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Kana and Kanji Conversion System -# select mirror from -# http://sourceforge.jp/projects/canna/downloads/9565/Canna37p3.tar.bz2/ +# http://canna.sourceforge.jp/ License: BSD-3-Clause Group: System/I18n/Japanese +URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/ +# select mirror from +# http://sourceforge.jp/projects/canna/downloads/9565/Canna37p3.tar.bz2/ Source: Canna37p3.tar.bz2 Source1: candoc.tar.bz2 Source2: rccanna @@ -73,6 +55,22 @@ Patch24: bug-262623-internet-usage-broken-by-security-patch.patch Patch25: Canna37p3-destbufferoverflow.patch Patch26: canna-fiximplicit.patch +BuildRequires: automake +BuildRequires: gcc +BuildRequires: imake +BuildRequires: ncurses-devel +BuildRequires: pwdutils +BuildRequires: termcap +Requires(pre): %{_sbindir}/groupadd +Requires(pre): %{_sbindir}/useradd +Requires(pre): /bin/rm +Recommends: cannadic +%if 0%{?suse_version} < 1230 +Requires(pre): %insserv_prereq +%else +BuildRequires: pkgconfig(systemd) +%{?systemd_requires} +%endif # Summary(ja): Canna - かな漢字変換システム # %description -n canna -l ja # UNIX 上で共通に使える日本語入力システムとして Wnn が存在しました。 @@ -105,33 +103,30 @@ environments, and on TTYs. Canna provides more than ten tools to maintain Kana to Kanji conversion dictionaries. - %package -n canna-libs -Summary: Canna Libraries -Group: System/I18n/Japanese -Provides: canna:/usr/lib/libcanna.so.1.1 +Summary: Canna Shared Libraries +Group: System/Libraries +Provides: canna:%{_prefix}/lib/libcanna.so.1.1 #Summary(ja): Canna ユーザインタフェースレベルのライブラリ # %description -n canna-libs -l ja # Canna ユーザインタフェースレベルのライブラリ %description -n canna-libs -Canna Libraries - +Canna Shared Libraries %package -n canna-devel -Summary: Libraries of Canna +Summary: Canna Development Headers and Libraries Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{name}-libs = %{version} -Provides: cannadev -Obsoletes: cannadev +Provides: cannadev = %{version}-%{release} +Obsoletes: cannadev < %{version}-%{release} #Summary(ja): Canna ユーザインタフェースレベルのライブラリ # %description -n canna-devel -l ja # Canna ユーザインタフェースレベルのライブラリ %description -n canna-devel -Canna libraries. - +Canna development headers and libraries. %prep %setup -q -n Canna37p3 -a 1 @@ -146,8 +141,8 @@ %patch17 -p1 -b .sortcall %patch18 -p1 -b .control-reaches-end-of-void-function %patch19 -p1 -b .noconfwrapper -%patch20 -p0 -b .noredefine -perl -pi -e 's#/usr/lib/termcap#%{_libdir}/termcap#' canuum/Imakefile +%patch20 -b .noredefine +perl -pi -e 's#%{_prefix}/lib/termcap#%{_libdir}/termcap#' canuum/Imakefile perl -pi -e 's#lib64#%{_lib}#' Canna.conf cp ${RPM_SOURCE_DIR}/jisx6002.kpdef dic/phono/ %patch21 -p1 @@ -161,26 +156,26 @@ xmkmf # parallel make does not work in some stages make -j1 Makefile -make -j1 CDEBUGFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" CXXDEBUGFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" canna +make -j1 CDEBUGFLAGS="%{optflags} -fPIC -fno-strict-aliasing" CXXDEBUGFLAGS="%{optflags} -fPIC -fno-strict-aliasing" canna pushd canuum - cp /usr/share/automake*/config.{guess,sub} . - export CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - export CXXDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + cp %{_datadir}/automake*/config.{guess,sub} . + export CDEBUGFLAGS="%{optflags} -fno-strict-aliasing" + export CXXDEBUGFLAGS="%{optflags} -fno-strict-aliasing" xmkmf -a - make %{?_smp_mflags} CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + make %{?_smp_mflags} CDEBUGFLAGS="%{optflags} -fno-strict-aliasing" CXXDEBUGFLAGS="%{optflags} -fno-strict-aliasing" popd %install # create home directory for user 'wnn': -mkdir -p $RPM_BUILD_ROOT/var/lib/wnn +mkdir -p %{buildroot}%{_localstatedir}/lib/wnn # add user 'wnn' (also used for Canna, not only for wnn) -/usr/sbin/useradd -r -o -g bin -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || : +%{_sbindir}/useradd -r -o -g bin -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || : make install DESTDIR=%{?buildroot} RPM_BUILD=TRUE make install.man MANSUFFIX=1 LIBMANSUFFIX=3 DESTDIR=%{?buildroot} # Make links for utility programs # (excluded from Make process via RPM_BUILD=TRUE) #..................................................................... -(cd %{?buildroot}/usr/bin; \ +(cd %{?buildroot}%{_prefix}/bin; \ for i in cpdic lsdic mkdic mvdic rmdic syncdic addwords delwords do ln -sf catdic $i @@ -190,52 +185,54 @@ pushd canuum make install DESTDIR=%{?buildroot} make install.man MANSUFFIX=1 LIBMANSUFFIX=3 DESTDIR=%{?buildroot} - chmod 755 $RPM_BUILD_ROOT/usr/bin/canuum + chmod 755 %{buildroot}%{_bindir}/canuum popd -%if %suse_version < 1230 -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/usr/sbin +%if 0%{?suse_version} < 1230 +mkdir -p %{buildroot}%{_initddir} +mkdir -p %{buildroot}%{_sbindir} %else -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d +mkdir -p %{buildroot}/%{_unitdir} +mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d %endif -mkdir -p $RPM_BUILD_ROOT/etc/hosts.canna -mkdir -p $RPM_BUILD_ROOT/var/lib/canna/log -%if %suse_version < 1230 -install -m 755 $RPM_SOURCE_DIR/rccanna $RPM_BUILD_ROOT/etc/init.d/canna -ln -s ../../etc/init.d/canna $RPM_BUILD_ROOT/usr/sbin/rccanna +mkdir -p %{buildroot}%{_sysconfdir}/hosts.canna +mkdir -p %{buildroot}%{_localstatedir}/lib/canna/log +%if 0%{?suse_version} < 1230 +install -m 755 %{_sourcedir}/rccanna %{buildroot}%{_initddir}/canna +ln -s ../..%{_initddir}/canna %{buildroot}%{_sbindir}/rccanna %else -install -m 644 $RPM_SOURCE_DIR/canna.service $RPM_BUILD_ROOT/%{_unitdir}/canna.service -install -m 644 $RPM_SOURCE_DIR/canna-tmpfiles.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/canna-tmpfiles.conf +install -m 644 %{_sourcedir}/canna.service %{buildroot}/%{_unitdir}/canna.service +install -m 644 %{_sourcedir}/canna-tmpfiles.conf %{buildroot}%{_prefix}/lib/tmpfiles.d/canna-tmpfiles.conf %endif -install -m 644 $RPM_SOURCE_DIR/hosts.canna %{?buildroot}/etc/hosts.canna +install -m 644 %{_sourcedir}/hosts.canna %{?buildroot}%{_sysconfdir}/hosts.canna # Remove all cannakill manpages because we've disabled it in # the server. -rm -f `find $RPM_BUILD_ROOT/usr/share/man -name 'cannakill*'` -rm -f $RPM_BUILD_ROOT/usr/sbin/cannakill +rm -f `find %{buildroot}%{_mandir} -name 'cannakill*'` +rm -f %{buildroot}%{_sbindir}/cannakill +find %{buildroot} -type f -name "*.a" -delete -print %pre -n canna -/usr/sbin/useradd -r -o -g bin -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || : -%if %suse_version >= 1230 +%{_sbindir}/useradd -r -o -g bin -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || : +%if 0%{?suse_version} >= 1230 %service_add_post canna.service %endif %post -n canna -%if %suse_version < 1230 +%if 0%{?suse_version} < 1230 %{fillup_and_insserv -y canna} %else %service_add_post canna.service +%tmpfiles_create %{_tmpfilesdir}/canna-tempfiles.conf %endif %preun -n canna -%if %suse_version < 1230 +%if 0%{?suse_version} < 1230 %stop_on_removal canna %else %service_del_preun canna.service %endif %postun -n canna -%if %suse_version < 1230 +%if 0%{?suse_version} < 1230 %restart_on_update canna %insserv_cleanup %else @@ -246,55 +243,50 @@ fi %post -n canna-libs -p /sbin/ldconfig - %postun -n canna-libs -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc CHANGES.jp README{,.jp} WHATIS{,.jp} candoc -%dir %attr(-,wnn,root) /var/log/canna -%dir %attr(-,wnn,root) /var/lib/canna/log -%dir %attr(-,wnn,root) /var/lib/wnn -/etc/hosts.canna -%if %suse_version < 1230 -/etc/init.d/canna -/usr/sbin/rccanna +%dir %attr(-,wnn,root) %{_localstatedir}/log/canna +%dir %attr(-,wnn,root) %{_localstatedir}/lib/canna/log +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn +%{_sysconfdir}/hosts.canna +%if 0%{?suse_version} < 1230 +%{_initddir}/canna +%{_sbindir}/rccanna %else %{_unitdir}/canna.service -%{_libexecdir}/tmpfiles.d/canna-tmpfiles.conf +%{_prefix}/lib/tmpfiles.d/canna-tmpfiles.conf %endif # don't package cannakill, it is disabled by okir's security patch anyway # /usr/sbin/cannakill # more secure permission for cannaserver # (setuid and setgid bits was set per default). -%attr(755,root,root) /usr/sbin/cannaserver -/usr/bin/* -%config /var/lib/canna/default.canna +%attr(755,root,root) %{_sbindir}/cannaserver +%{_bindir}/* +%config %{_localstatedir}/lib/canna/default.canna #%config /var/lib/canna/engine.cf -%dir /var/lib/canna/ -%dir %attr(755,wnn,root) /var/lib/canna/dic/ -%attr(-,wnn,root) /var/lib/canna/dic/*cbp -%dir %attr(755,wnn,root) /var/lib/canna/dic/canna/ -%attr(-,wnn,root) /var/lib/canna/dic/canna/* -/var/lib/canna/sample/ -%dir /usr/share/man/ja/ -%dir /usr/share/man/ja/man1/ -/usr/share/man/ja/man1/* -/usr/share/man/man1/* +%dir %{_localstatedir}/lib/canna/ +%dir %attr(755,wnn,root) %{_localstatedir}/lib/canna/dic/ +%attr(-,wnn,root) %{_localstatedir}/lib/canna/dic/*cbp +%dir %attr(755,wnn,root) %{_localstatedir}/lib/canna/dic/canna/ +%attr(-,wnn,root) %{_localstatedir}/lib/canna/dic/canna/* +%{_localstatedir}/lib/canna/sample/ +%dir %{_mandir}/ja/ +%dir %{_mandir}/ja/man1/ +%{_mandir}/ja/man1/* +%{_mandir}/man1/* %files -n canna-libs -%defattr(-, root, root) %{_libdir}/lib*.so.* -%{_libdir}/lib*.so %files -n canna-devel -%defattr(-, root, root) -%{_libdir}/lib*.*a -%dir /usr/include/canna -/usr/include/canna/*.h -%dir /usr/share/man/ja/ -%dir /usr/share/man/ja/man3/ -/usr/share/man/ja/man3/* -/usr/share/man/man3/* +%{_libdir}/lib*.so +%dir %{_includedir}/canna +%{_includedir}/canna/*.h +%dir %{_mandir}/ja/ +%dir %{_mandir}/ja/man3/ +%{_mandir}/ja/man3/* +%{_mandir}/man3/* %changelog
