rpms/kinput2/devel kinput2.spec,1.17,1.18

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23847

Modified Files:
	kinput2.spec 
Log Message:
clean up


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kinput2.spec	28 Sep 2007 01:54:11 -0000	1.17
+++ kinput2.spec	28 Sep 2007 02:32:58 -0000	1.18
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -77,7 +77,7 @@
 
 %prep
 %setup -q
-cp ${RPM_SOURCE_DIR}/Kinput2.conf.* .
+cp -a ${RPM_SOURCE_DIR}/Kinput2.conf.* .
 %patch0 -p1
 %ifarch ppc
 %patch1 -p1
@@ -151,37 +151,37 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 
 %if %{build_with_wnn4}
-install -c -m 0755 kinput2.wnn4       $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.wnn4       $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_wnn6}
-install -c -m 0755 kinput2.wnn6       $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.wnn6       $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna}
-install -c -m 0755 kinput2.canna      $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna      $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna_wnn4}
-install -c -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna_wnn6}
-install -c -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
+install -p -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
 
 %if %{is_wnn_used}
 mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-install -c -m 0444 ccdef/rule.*  $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -p -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -p -m 0444 ccdef/rule.*  $RPM_BUILD_ROOT/usr/lib/X11/ccdef
 %endif
 
 make install.man DESTDIR=$RPM_BUILD_ROOT
 
 %if %{is_canna_used}
-install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna
+install -D -m 0644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna
 %endif
 %if %{is_wnn_used}
-install -D -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn
+install -D -m 0644 -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn
 %endif
 
 %clean
@@ -256,8 +256,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
-* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-36
 - Add Requires: Canna to get it working just installing the package.
+- clean up a bit the spec file.
 
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
 - Add the versioned dependency for im-chooser.