rpms/kinput2/devel kinput2.spec,1.3,1.4
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Tue Mar 7 13:03:57 UTC 2006
- Previous message (by thread): rpms/proftpd/devel .cvsignore, 1.6, 1.7 proftpd.spec, 1.12, 1.13 sources, 1.6, 1.7
- Next message (by thread): rpms/gtkwave/devel gtkwave.spec, 1.8, 1.9 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tagoh
Update of /cvs/extras/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15102
Modified Files:
kinput2.spec
Log Message:
* Tue Mar 7 2006 Akira TAGOH <tagoh at redhat.com> - v3.1-27
- moved out from /usr/X11R6. (#170934)
Index: kinput2.spec
===================================================================
RCS file: /cvs/extras/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kinput2.spec 12 Jul 2005 00:53:31 -0000 1.3
+++ kinput2.spec 7 Mar 2006 13:03:56 -0000 1.4
@@ -25,10 +25,11 @@
Name: kinput2
Version: v3.1
-Release: 26%{?dist}
+Release: 27%{?dist}
License: Distributable
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: xorg-x11-devel
+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
+BuildRequires: imake >= 1.0.1-3
%if %{is_canna_used}
BuildRequires: Canna-devel >= 3.7p1-6
%endif
@@ -130,38 +131,30 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6
-if [ -d %{_prefix}/X11R6.1 ]; then
- ln -sf $RPM_BUILD_ROOT%{_prefix}/X11R6 $RPM_BUILD_ROOT%{_prefix}/X11R6.1
-fi
-if [ -d %{_prefix}/X11R6.3 ]; then
- ln -sf $RPM_BUILD_ROOT%{_prefix}/X11R6 $RPM_BUILD_ROOT%{_prefix}/X11R6.3
-fi
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
%if %{build_with_wnn4}
-install -c -m 0755 kinput2.wnn4 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install -c -m 0755 kinput2.wnn4 $RPM_BUILD_ROOT%{_bindir}
%endif
%if %{build_with_wnn6}
-install -c -m 0755 kinput2.wnn6 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install -c -m 0755 kinput2.wnn6 $RPM_BUILD_ROOT%{_bindir}
%endif
%if %{build_with_canna}
-install -c -m 0755 kinput2.canna $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install -c -m 0755 kinput2.canna $RPM_BUILD_ROOT%{_bindir}
%endif
%if %{build_with_canna_wnn4}
-install -c -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install -c -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%{_prefix}/X11R6/bin
+install -c -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir}
%endif
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults
-install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults/Kinput2
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
+install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef
-install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef
-install -c -m 0444 ccdef/rule.* $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
+install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
+install -c -m 0444 ccdef/rule.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
make install.man DESTDIR=$RPM_BUILD_ROOT
@@ -177,19 +170,19 @@
%post
%if %([ '%{build_with_wnn4}' -eq '1' -a '%{build_with_wnn6}' -eq '0' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.wnn4 %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.wnn4 %{_bindir}/kinput2
%endif
%if %([ '%{build_with_wnn6}' -eq '1' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.wnn6 %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.wnn6 %{_bindir}/kinput2
%endif
%if %([ '%{build_with_canna}' -eq '1' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.canna %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.canna %{_bindir}/kinput2
%endif
%if %([ '%{build_with_canna_wnn4}' -eq '1' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.canna-wnn4 %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.canna-wnn4 %{_bindir}/kinput2
%endif
%if %{build_with_canna_wnn6}
-ln -sf kinput2.canna-wnn6 %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.canna-wnn6 %{_bindir}/kinput2
%endif
%if %{is_canna_used}
%{inst_alternatives_canna}
@@ -200,7 +193,7 @@
%preun
if [ "$1" = 0 ]; then
- rm -rf %{_prefix}/X11R6/bin/kinput2
+ rm -rf %{_bindir}/kinput2
%if %{is_canna_used}
%{uninst_alternatives_canna}
%endif
@@ -211,19 +204,19 @@
%triggerpostun -- kinput2-canna-wnn6
%if %([ '%{build_with_wnn4}' -eq '1' -a '%{build_with_wnn6}' -eq '0' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.wnn4 %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.wnn4 %{_bindir}/kinput2
%endif
%if %([ '%{build_with_wnn6}' -eq '1' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.wnn6 %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.wnn6 %{_bindir}/kinput2
%endif
%if %([ '%{build_with_canna}' -eq '1' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.canna %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.canna %{_bindir}/kinput2
%endif
%if %([ '%{build_with_canna_wnn4}' -eq '1' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.canna-wnn4 %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.canna-wnn4 %{_bindir}/kinput2
%endif
%if %{build_with_canna_wnn6}
-ln -sf kinput2.canna-wnn6 %{_prefix}/X11R6/bin/kinput2
+ln -sf kinput2.canna-wnn6 %{_bindir}/kinput2
%endif
%if %{is_canna_used}
%{inst_alternatives_canna}
@@ -235,19 +228,22 @@
%files
%defattr(-, root, root)
%doc Copyright NEWS README doc
-%config %{_prefix}/X11R6/lib/X11/app-defaults/Kinput2
+%config %{_datadir}/X11/app-defaults/Kinput2
%if %{is_wnn_used}
-%{_prefix}/X11R6/lib/X11/ccdef
+%{_libdir}/X11/ccdef
%endif
-%{_prefix}/X11R6/bin/kinput2*
-%{_prefix}/X11R6/man/man1/kinput2.1x*
+%{_bindir}/kinput2*
+%{_mandir}/man1/kinput2.1x*
%{_sysconfdir}/X11/xinit/xinput.d
%changelog
-* Tue Jul 12 2005 Akira TAGOH <tagoh at redhat.com> - v3.1-26.fc5
+* Tue Mar 7 2006 Akira TAGOH <tagoh at redhat.com> - v3.1-27
+- moved out from /usr/X11R6. (#170934)
+
+* Tue Jul 12 2005 Akira TAGOH <tagoh at redhat.com> - v3.1-26
- use proper xinput script for kinput2-wnn.
-* Thu Jun 30 2005 Akira TAGOH <tagoh at redhat.com> - v3.1-25.fc5
+* Thu Jun 30 2005 Akira TAGOH <tagoh at redhat.com> - v3.1-25
- Import into Extras.
* Tue Feb 8 2005 Akira TAGOH <tagoh at redhat.com> - v3.1-24
- Previous message (by thread): rpms/proftpd/devel .cvsignore, 1.6, 1.7 proftpd.spec, 1.12, 1.13 sources, 1.6, 1.7
- Next message (by thread): rpms/gtkwave/devel gtkwave.spec, 1.8, 1.9 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list