Hello community,
here is the log from the commit of package coolmail
checked in at Thu Aug 10 22:56:49 CEST 2006.
--------
--- coolmail/coolmail.changes 2006-05-22 20:37:04.000000000 +0200
+++ coolmail/coolmail.changes 2006-08-10 21:23:48.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 10 20:56:50 CEST 2006 - lmichnovic@suse.cz
+
+- builds also with X.org 7.x (xorg7.patch)
+
+-------------------------------------------------------------------
Old:
----
coolmail-1.3-gcc_warning.diff
coolmail-1.3-ia64.diff
coolmail-1.3.patch
New:
----
coolmail-1.3-Makefile.patch
coolmail-1.3-gcc_warning.patch
coolmail-1.3-ia64.patch
coolmail-1.3-xorg7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ coolmail.spec ++++++
--- /var/tmp/diff_new_pack.pR82YE/_old 2006-08-10 22:56:29.000000000 +0200
+++ /var/tmp/diff_new_pack.pR82YE/_new 2006-08-10 22:56:29.000000000 +0200
@@ -16,12 +16,13 @@
Group: Productivity/Networking/Email/Utilities
Autoreqprov: on
Version: 1.3
-Release: 1055
+Release: 1056
Summary: A Cool XBiff Clone
Source: coolmail-%{version}.tar.gz
-Patch0: coolmail-%{version}.patch
-Patch1: coolmail-%{version}-ia64.diff
-Patch2: coolmail-%{version}-gcc_warning.diff
+Patch0: coolmail-%{version}-Makefile.patch
+Patch1: coolmail-%{version}-ia64.patch
+Patch2: coolmail-%{version}-gcc_warning.patch
+Patch3: coolmail-%{version}-xorg7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -43,13 +44,22 @@
%patch0
%patch1
%patch2
+# apply this patch only when building against X.org 7.x or higher
+%if "%(xft-config --prefix)" == "/usr"
+%patch3
+%endif
%build
+%if "%(xft-config --prefix)" == "/usr"
+make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
+ LIB_DIRS="-L/usr/%{_lib}"
+%else
make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
LIB_DIRS="-L/usr/X11R6/%{_lib}"
+%endif
%install
-install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/bin
+install -d -m 755 $RPM_BUILD_ROOT/usr/bin
install -d -m 755 $RPM_BUILD_ROOT/usr/share/man/man1
make DESTDIR="$RPM_BUILD_ROOT" install
@@ -58,10 +68,16 @@
%files
%defattr(-,root,root)
+%if "%(xft-config --prefix)" == "/usr"
+/usr/bin/coolmail
+%else
/usr/X11R6/bin/coolmail
+%endif
%doc %{_mandir}/man1/*
%changelog -n coolmail
+* Thu Aug 10 2006 - lmichnovic@suse.cz
+- builds also with X.org 7.x (xorg7.patch)
* Mon May 22 2006 - schwab@suse.de
- Don't strip binaries.
* Wed Jan 25 2006 - mls@suse.de
++++++ coolmail-1.3-Makefile.patch ++++++
--- Makefile
+++ Makefile 2000/04/04 11:29:49
@@ -24,10 +24,10 @@
# files for coolmail when you type `make install'.
CFLAGS =
LINK = $(CC)
-INCLUDES = -I/usr/X11R5/include
-LIB_DIRS = -L/usr/X11R5/lib
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man/man1
+INCLUDES = -I/usr/X11R6/include
+LIB_DIRS = -L/usr/X11R6/lib
+BINDIR = $(DESTDIR)/usr/X11R6/bin
+MANDIR = $(DESTDIR)/usr/share/man/man1
# Comment these out if you can't or don't want to use the digitized audio
# feature.
++++++ coolmail-1.3-gcc_warning.patch ++++++
--- audio.c
+++ audio.c
@@ -39,6 +39,7 @@
#include