Hello community, here is the log from the commit of package fvwm-themes checked in at Mon Aug 14 18:26:37 CEST 2006. -------- --- fvwm-themes/fvwm-themes.changes 2006-01-25 21:46:24.000000000 +0100 +++ fvwm-themes/fvwm-themes.changes 2006-08-14 18:19:33.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 14 18:19:26 CEST 2006 - mfabian@suse.de + +- fix build in STABLE (move to X11R7). + +------------------------------------------------------------------- New: ---- destdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fvwm-themes.spec ++++++ --- /var/tmp/diff_new_pack.uA4Cy2/_old 2006-08-14 18:26:10.000000000 +0200 +++ /var/tmp/diff_new_pack.uA4Cy2/_new 2006-08-14 18:26:10.000000000 +0200 @@ -1,26 +1,30 @@ # # spec file for package fvwm-themes (Version 0.6.2) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libselinux libstdc++ libxcrypt m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed sendmail strace syslogd sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel XFree86-devel XFree86-libs autoconf automake binutils expat fontconfig fontconfig-devel fvwm2 gcc gdbm gettext libtool perl rpm Name: fvwm-themes BuildRequires: fvwm2 xorg-x11-devel +%if "%(xft-config --prefix)" == "/usr" +%define xprefix /usr +%else +%define xprefix /usr/X11R6 +%endif License: GPL Group: System/GUI/Other Autoreqprov: on Version: 0.6.2 -Release: 135 +Release: 204 Prereq: /usr/bin/perl /usr/bin/mkfifo Requires: fvwm2 >= 2.3.30, perl >= 5.002 -Summary: configurational framework for FVWM +Summary: FVWM Configuration Framework URL: http://fvwm-themes.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/fvwm-themes/fvwm-themes-full-0.6.2.tar.bz... Patch0: fvwm-themes-0.4.2-icon-names.patch @@ -30,13 +34,14 @@ Patch4: head.patch Patch5: acdivert.patch Patch6: configure.patch +Patch7: destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -FVWM Themes is a powerful configurational framework for FVWM, designed -to be easily extendible and configurable, includes several pre-built -themes, a pack of images and sounds. +FVWM Themes is a powerful configuration framework for FVWM, designed to +be easily extendable and configurable. It includes several prebuilt +themes and a pack of images and sounds. @@ -53,21 +58,23 @@ %patch4 -p1 -b .head %patch5 -p1 -b .acdivert %patch6 -p1 -b .configure +%patch7 -p1 %build autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS" -./configure --disable-build-menus \ +./configure --prefix=%{xprefix} \ + --mandir=%{_mandir} \ + --disable-build-menus \ --without-gnome make %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; -make ROOT_PREFIX=$RPM_BUILD_ROOT install -for i in /usr/X11R6/share/fvwm/themes/current/theme.cfg \ - /usr/X11R6/share/fvwm/themes-rc \ - /usr/X11R6/share/fvwm/themes-rc-2 \ - /usr/X11R6/share/fvwm/themes-rc-3 ; do +make DESTDIR=$RPM_BUILD_ROOT install +for i in %{xprefix}/share/fvwm/themes/current/theme.cfg \ + %{xprefix}/share/fvwm/themes-rc \ + %{xprefix}/share/fvwm/themes-rc-2 \ + %{xprefix}/share/fvwm/themes-rc-3 ; do sed -e "s@$RPM_BUILD_ROOT@@g" < $RPM_BUILD_ROOT/$i > xxtmp mv xxtmp $RPM_BUILD_ROOT/$i done @@ -82,11 +89,13 @@ %defattr(-,root,root) %doc AUTHORS COPYING INSTALL NEWS README TODO %doc doc/FAQ doc/README.1st doc/colorsets doc/fvwm-themes.lsm -/usr/X11R6/bin/* -/usr/X11R6/man/man?/* -/usr/X11R6/share/fvwm/* +%{xprefix}/bin/* +%{xprefix}/share/fvwm/* +%{_mandir}/man?/* %changelog -n fvwm-themes +* Mon Aug 14 2006 - mfabian@suse.de +- fix build in STABLE (move to X11R7). * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Mon Feb 23 2004 - hmacht@suse.de ++++++ destdir.patch ++++++ diff -ru fvwm-themes-full-0.6.2/bin/fvwm-themes-config.in fvwm-themes-full-0.6.2.new/bin/fvwm-themes-config.in --- fvwm-themes-full-0.6.2/bin/fvwm-themes-config.in 2002-12-06 03:59:06.000000000 +0100 +++ fvwm-themes-full-0.6.2.new/bin/fvwm-themes-config.in 2006-08-14 18:14:48.000000000 +0200 @@ -7,7 +7,9 @@ use strict; use Getopt::Long; +my $DESTDIR= $ENV{'DESTDIR'} || ''; my $prefix = $ENV{'prefix'} || '@prefix@'; +$prefix = $DESTDIR . $prefix; my $ROOT_PREFIX = $ENV{'ROOT_PREFIX'} || '@ROOT_PREFIX@'; my $bindir = "@bindir@"; my $datadir = "@datadir@"; fvwm-themes-full-0.6.2.new/binだけに発見: fvwm-themes-config.in.~1~ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org