rpms/digikam-doc/EL-5 .cvsignore, 1.3, 1.4 digikam-doc.spec, 1.3, 1.4 sources, 1.3, 1.4

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/digikam-doc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15157

Modified Files:
	.cvsignore digikam-doc.spec sources 
Log Message:
sync w/devel branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam-doc/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Mar 2007 00:14:11 -0000	1.3
+++ .cvsignore	23 Oct 2008 13:45:59 -0000	1.4
@@ -1 +1 @@
-digikam-doc-0.9.1.tar.bz2
+digikam-doc-0.9.4.tar.bz2


Index: digikam-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam-doc/EL-5/digikam-doc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- digikam-doc.spec	30 Mar 2007 00:14:11 -0000	1.3
+++ digikam-doc.spec	23 Oct 2008 13:45:59 -0000	1.4
@@ -1,26 +1,36 @@
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+%endif
+
 Name:		digikam-doc
-Version:	0.9.1
-Release:	1%{?dist}
+Version:	0.9.4
+Release:	2%{?dist}
 Summary:	Documentation for the digiKam and Showfoto
 
 Group:		Documentation
 License:	GFDL
 URL:		http://www.digikam.org/
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
-BuildRequires:	kdelibs-devel
+BuildRequires:	automake %{kdelibs3}-devel
 Requires:	digikam >= %{version}
 
+Provides:	digikamimageplugins-doc = %{version}-%{release}
+Obsoletes:	digikamimageplugins-doc < 0.9.0-2
+
 %description
 Documentation for the digiKam and Showfoto.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
-export kde_htmldir=%{_docdir}/HTML
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
+
 %configure --target=%{_build_cpu}
 make %{?_smp_mflags}
 
@@ -28,10 +38,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Fix AUTHORS encoding
-iconv -f ISO-8859-1 -t UTF-8 < AUTHORS > AUTHORS.tmp
-mv -f AUTHORS.tmp AUTHORS
-
 # Make symlink relative
 pushd $RPM_BUILD_ROOT%{_docdir}/HTML/
 for i in *
@@ -56,6 +62,21 @@
 %{_docdir}/HTML/*/showfoto/
 
 %changelog
+* Sun May 11 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.4-2
+- Update to 0.9.4
+
+* Thu Jan 10 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.3-1
+- Update to 0.9.3
+
+* Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.2.beta3
+- BR: kdelibs3-devel
+
+* Sat Dec 01 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.3-0.1.beta3
+- Update to 0.9.3-beta3
+
+* Thu Jun 07 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.1.beta2
+- Update to 0.9.2-beta2 (merge with digikamimageplugins-doc)
+
 * Thu Mar 29 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-1
 - Update to 0.9.1
 - Spec tweak up


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam-doc/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2007 00:14:11 -0000	1.3
+++ sources	23 Oct 2008 13:45:59 -0000	1.4
@@ -1 +1 @@
-9c11658ed72fb59d275daabb4e36f015  digikam-doc-0.9.1.tar.bz2
+1d8c8a16976186e511efefd8e06ba91a  digikam-doc-0.9.4.tar.bz2