Hello community,

here is the log from the commit of package kinput2 for openSUSE:Factory checked 
in at 2020-11-29 12:27:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kinput2 (Old)
 and      /work/SRC/openSUSE:Factory/.kinput2.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kinput2"

Sun Nov 29 12:27:37 2020 rev:27 rq:851126 version:v3.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/kinput2/kinput2.changes  2020-08-20 
22:29:42.160005845 +0200
+++ /work/SRC/openSUSE:Factory/.kinput2.new.5913/kinput2.changes        
2020-11-29 12:27:37.969953907 +0100
@@ -1,0 +2,5 @@
+Thu Nov 26 14:57:37 UTC 2020 - Fuminobu Takeyama <ft...@geeko.jp>
+
+- move /etc/X11/xim.d/* to /usr/etc/X11/xim.d/ (boo#1176431)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kinput2.spec ++++++
--- /var/tmp/diff_new_pack.PMaVlM/_old  2020-11-29 12:27:38.673954618 +0100
+++ /var/tmp/diff_new_pack.PMaVlM/_new  2020-11-29 12:27:38.677954623 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kinput2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,17 +12,23 @@
 # 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/
 #
 
 
+%if ! %{defined _distconfdir}
+%define _distconfdir %{_sysconfdir}
+%else
+%define use_usretc 1
+%endif
+
 Name:           kinput2
 Version:        v3.1
 Release:        0
 Summary:        Kanji Input Server for the X Window System
 License:        HPND
 Group:          System/I18n/Japanese
-Url:            ftp://ftp.sra.co.jp/pub/x11/kinput2
+URL:            ftp://ftp.sra.co.jp/pub/x11/kinput2
 Source:         ftp://ftp.sra.co.jp/pub/x11/kinput2/%{name}-v3.1.tar.bz2
 Source10:       etc-x11-xim.d-kinput2-canna
 Source11:       etc-x11-xim.d-kinput2-wnn
@@ -91,12 +97,12 @@
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 make install.man MANSUFFIX=1 LIBMANSUFFIX=3 DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ja
+mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/ja
 install -m 644 %{SOURCE10} \
-               %{buildroot}%{_sysconfdir}/X11/xim.d/kinput2-canna
+               %{buildroot}%{_distconfdir}/X11/xim.d/kinput2-canna
 install -m 644 %{SOURCE11} \
-               %{buildroot}%{_sysconfdir}/X11/xim.d/kinput2-wnn
-pushd  %{buildroot}%{_sysconfdir}/X11/xim.d/
+               %{buildroot}%{_distconfdir}/X11/xim.d/kinput2-wnn
+pushd  %{buildroot}%{_distconfdir}/X11/xim.d/
     ln -s kinput2-canna kinput2
     pushd ja
         ln -s ../kinput2-canna 70-kinput2-canna
@@ -108,7 +114,13 @@
 %defattr(-, root, root)
 %doc Copyright NEWS doc
 %doc client/README
+%if %{defined use_usretc}
+%dir %{_distconfdir}/X11
+%dir %{_distconfdir}/X11/xim.d
+%{_distconfdir}/X11/xim.d/*
+%else
 %config %{_sysconfdir}/X11/xim.d/*
+%endif
 %{_bindir}/*
 %{_datadir}/X11/app-defaults
 %doc %{_mandir}/*/*
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives: 
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org

Reply via email to