rpms/digikam/devel digikam-0.8.0-modular-X.patch, NONE, 1.1 digikam.spec, 1.5, 1.6

[Marcin Garski (mgarski)]

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19194

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.8.0-modular-X.patch 
Log Message:
- Add new paths for modular X.Org


digikam-0.8.0-modular-X.patch:

--- NEW FILE digikam-0.8.0-modular-X.patch ---
diff -urN digikam-0.8.0-orig/acinclude.m4 digikam-0.8.0/acinclude.m4
--- digikam-0.8.0-orig/acinclude.m4	2005-11-21 20:14:06.000000000 +0100
+++ digikam-0.8.0/acinclude.m4	2005-12-13 16:37:55.000000000 +0100
@@ -44,6 +44,7 @@
 [# Look for the header file in a standard set of common directories.
 # Check X11 before X11Rn because it is often a symlink to the current release.
   for ac_dir in               \
+    /usr/share/X11/include    \
     /usr/X11/include          \
     /usr/X11R6/include        \
     /usr/X11R5/include        \
@@ -104,6 +105,7 @@
 # First see if replacing the include by lib works.
 # Check X11 before X11Rn because it is often a symlink to the current release.
 for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+    /usr/share/X11/lib${kdelibsuff}     \
     /usr/X11/lib${kdelibsuff}           \
     /usr/X11R6/lib${kdelibsuff}         \
     /usr/X11R5/lib${kdelibsuff}         \


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- digikam.spec	9 Dec 2005 15:53:16 -0000	1.5
+++ digikam.spec	13 Dec 2005 15:50:43 -0000	1.6
@@ -1,17 +1,18 @@
 Name:		digikam
 Version:	0.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.8.0-modular-X.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	gettext autoconf
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -37,14 +38,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
+autoreconf
+
 %configure \
-	--with-extra-includes=/usr/share/X11/ \
-	--with-extra-libs=/usr/share/X11/ \
 	--disable-rpath \
 	--disable-debug
 make %{?_smp_mflags}
@@ -117,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-3
+- Add new paths for modular X.Org
+
 * Fri Dec 09 2005 Marcin Garski <mgarski at post.pl> 0.8.0-2
 - Work around for modular X.Org paths