Hello community, here is the log from the commit of package xvkbd for openSUSE:Factory checked in at Fri Mar 19 09:51:18 CET 2010. -------- --- xvkbd/xvkbd.changes 2010-03-14 16:39:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/xvkbd/xvkbd.changes 2010-03-17 19:09:50.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Mar 17 18:07:22 UTC 2010 - pascal.bleser@opensuse.org + +- fixed build on SLES_9 and SLE_10 by using the prefix /usr/X11R6 + as well as /usr/X11R6/lib/X11/app-defaults instead of /usr and + /usr/share/X11/app-defaults, respectively + +- removed bogus and insecure rm -rf $RPM_BUILD_ROOT at the + beginning of the %install section + +- use install + suse_update_desktop_file -r instead of + suse_update_desktop_file -i to fix the bogus rpmlint warning + message about untranslated desktop entries + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xvkbd.spec ++++++ --- /var/tmp/diff_new_pack.K9MvdZ/_old 2010-03-19 09:49:07.000000000 +0100 +++ /var/tmp/diff_new_pack.K9MvdZ/_new 2010-03-19 09:49:07.000000000 +0100 @@ -17,6 +17,13 @@ # norootforbuild +%if 0%{?suse_version} < 1020 +%define _prefix %{_usr}/X11R6 +%define _mandir %{_prefix}/man +%define appdefdir %{_prefix}/lib/X11/app-defaults +%else +%define appdefdir %{_datadir}/X11/app-defaults +%endif Name: xvkbd BuildRequires: update-desktop-files xaw3d xorg-x11-devel @@ -25,7 +32,7 @@ %endif Summary: Virtual Keyboard for the X Window System Version: 3.2 -Release: 1 +Release: 2 License: GPLv2+ Group: System/X11/Utilities BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,29 +64,30 @@ make CCOPTIONS="$RPM_OPT_FLAGS" %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install.man +%if %suse_version > 820 +%__install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_usr}/share/applications/%{name}.desktop" %if %suse_version > 1010 -%suse_update_desktop_file -i xvkbd Utility Accessibility -%endif -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp %{SOURCE3} $RPM_BUILD_ROOT/usr/share/X11/app-defaults/xvkbd.default +%suse_update_desktop_file -r %{name} Utility Accessibility +%endif #1010 +%endif #820 +%__install -D -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_usr}/share/pixmaps/xvkbd.png +%__install -D -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{appdefdir}/xvkbd.default %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) -%doc /usr/share/man/man1/* -/usr/share/X11/app-defaults/XVkbd* -/usr/share/X11/app-defaults/xvkbd.default -/usr/bin/xvkbd +%doc %{_mandir}/man1/xvkbd.1* +%{appdefdir}/XVkbd* +%{appdefdir}/xvkbd.default +%{_bindir}/xvkbd %if %suse_version > 820 -%{_datadir}/applications/*.desktop +%{_usr}/share/applications/%{name}.desktop %endif -%{_datadir}/pixmaps/*.png +%{_usr}/share/pixmaps/xvkbd.png %doc README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org