Hello community, here is the log from the commit of package xpexeso checked in at Wed Aug 2 16:24:25 CEST 2006. -------- --- xpexeso/xpexeso.changes 2006-07-13 11:28:12.000000000 +0200 +++ xpexeso/xpexeso.changes 2006-07-28 13:03:00.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 28 12:20:54 CEST 2006 - lmichnovic@suse.cz + +- builds also with new X.org 7.x, detecting prefix in X.org +- building with icecream +- using RPM_OPT_FLAGS + +------------------------------------------------------------------- Old: ---- README-vprirode ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpexeso.spec ++++++ --- /var/tmp/diff_new_pack.3GN4kZ/_old 2006-08-02 16:24:11.000000000 +0200 +++ /var/tmp/diff_new_pack.3GN4kZ/_new 2006-08-02 16:24:11.000000000 +0200 @@ -16,7 +16,7 @@ Group: Amusements/Games/Board/Other Autoreqprov: on Version: 2003.5.26 -Release: 198 +Release: 199 Summary: An X Window System Game with 64 Picture Cards Source: xpexeso-20030526.tar.bz2 Source1: xpexeso.po @@ -26,6 +26,33 @@ Patch1: xpexeso-vprirode.patch URL: http://math.feld.cvut.cz/olsak/xpexeso.html BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if "%(xft-config --prefix)" == "/usr" +%define _xorg7libs %_lib +%define _xorg7libs32 lib +%define _xorg7bin bin +%define _xorg7_mandir %_mandir +%define _xorg7pixmaps include +%define _xorg7libshare share +%define _xorg7_xkb /usr/share/X11/xkb +%define _xorg7_termcap /usr/lib/X11/etc +%define _xorg7_serverincl /usr/include/xorg +%define _xorg7_fonts /usr/share/fonts +#%define _xorg7_config /usr/share/X11/config #use libshare macro +%define _xorg7_prefix /usr +%else +%define _xorg7libs X11R6/%_lib +%define _xorg7libs32 X11R6/lib +%define _xorg7bin X11R6/bin +%define _xorg7_mandir /usr/X11R6/man +%define _xorg7pixmaps X11R6/include +%define _xorg7libshare X11R6/lib/ +%define _xorg7_xkb /etc/X11/xkb +%define _xorg7_termcap /usr/X11R6/lib/X11/etc +%define _xorg7_serverincl /usr/X11R6/lib/Server/include +%define _xorg7_fonts /usr/X11R6/lib/X11/fonts +#%define _xorg7_config /usr/X11R6/lib/X11/config #use libshare macro +%define _xorg7_prefix /usr/X11R6 +%endif %description The game is for two or more players. If the xpexeso program is used, @@ -51,7 +78,7 @@ %build xmkmf -a -make +make %{?jobs:-j%jobs} CCOPTIONS="$RPM_OPT_FLAGS" # just for translators #make xpexeso.po msgfmt xpexeso.po -o xpexeso.mo @@ -61,8 +88,8 @@ install -d $RPM_BUILD_ROOT/usr/share/locale/cs/LC_MESSAGES/ install xpexeso.mo $RPM_BUILD_ROOT/usr/share/locale/cs/LC_MESSAGES/ install README.SuSE $RPM_BUILD_ROOT/usr/share/doc/packages/xpexeso/ -install -d $RPM_BUILD_ROOT/usr/X11R6/include/X11/pixmaps/ -install xpexeso.xpm $RPM_BUILD_ROOT/usr/X11R6/include/X11/pixmaps/ +install -d $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/ +install xpexeso.xpm $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/ %suse_update_desktop_file -c xpexeso %name xpexeso /usr/games/xpeseso xpexeso.xpm Game BoardGame %clean @@ -75,11 +102,15 @@ %docdir /usr/share/doc/packages/xpexeso/ /usr/share/doc/packages/xpexeso/ /usr/share/locale/cs/LC_MESSAGES/xpexeso.mo -/usr/X11R6/include/X11/pixmaps/* +/usr/%{_xorg7pixmaps}/X11/pixmaps/* /usr/share/applications/xpexeso.desktop /usr/share/pixmaps/xpexeso.xpm %changelog -n xpexeso +* Fri Jul 28 2006 - lmichnovic@suse.cz +- builds also with new X.org 7.x, detecting prefix in X.org +- building with icecream +- using RPM_OPT_FLAGS * Thu Jul 13 2006 - lmichnovic@suse.cz - added cards "Nature" ("V prirode") and adjusted configure files (vprirode.patch) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...