rpms/showimg/devel showimg.spec,1.29,1.30

Sun Aug 9 14:17:28 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/showimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23978

Modified Files:
	showimg.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.5-25
- FTBFS showimg-0.9.5-22.fc11 (#511576)
- disable pgsql support for f12+
- add icon/mime scriptlets
- %description/%summary: s/for KDE//



Index: showimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30

--- showimg.spec	27 Jul 2009 04:17:27 -0000	1.29
+++ showimg.spec	9 Aug 2009 14:17:28 -0000	1.30
@@ -1,30 +1,40 @@
 Name:           showimg
 Version:        0.9.5
 Release:        24%{?dist}
-Summary:        Feature-rich image viewer for KDE
+Summary:        Feature-rich image viewer
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.jalix.org/projects/showimg
 Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 Patch0:         showimg-0.9.5-gcc43.patch
-Patch1:			showimg-0.9.5-gcc44.patch
+Patch1:		showimg-0.9.5-gcc44.patch
 # Both patches have been sent to author (rgroult [AT] jalix [DOT] org) on 2009/04/19
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  automake libtool
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdebase3-devel
 BuildRequires:  gettext
 BuildRequires:  glib2-devel
 BuildRequires:  libkexif-devel, libexif-devel
-BuildRequires:  mysql-devel, postgresql-devel, libpqxx-devel
+BuildRequires:  mysql-devel
+## build broken with f12+'s libpqxx-3.0
+%if 0%{?fedora} > 11
+Obsoletes: %{name}-pgsql < 0.9.5-24
+%else
+BuildRequires: libpqxx-devel
+BuildConflicts: libpqxx-devel >= 3.0
+%define _enable_pgsql --enable-pgsql
+%define dt_vendir fedora
+%endif
 
-Requires(post):   /sbin/ldconfig
+Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 
 %description
-ShowImg is a feature-rich image viewer for KDE including an
+ShowImg is a feature-rich image viewer including an
 image management system. It is highly configurable and supports
 numerous image formats.
 
@@ -32,7 +42,7 @@ numerous image formats.
 %package mysql
 Summary:        MySQL plugin for the Showimg image database
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description mysql
 This is the plugin to use MySQL as the backend for Showimg's image
@@ -42,7 +52,7 @@ database
 %package pgsql
 Summary:        PostgreSQL plugin for the Showimg image database
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description pgsql
 This is the plugin to use PostgreSQL as the backend for Showimg's image
@@ -55,41 +65,60 @@ database
 %patch1 -b .gcc44
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
+# "checking for working mktime" hangs for me(f11/x86_64) -- Rex
+sed -iautofoo \
+  -e 's|autoconf\*2.5\*|autoconf\*2.5\* \| autoconf\*2.6\*|' \
+  -e 's|autoheader\*2.5\*|autoheader\*2.5\* \| autoheader\*2.6\*|' \
+  -e 's|automake\*1.9\*|automake\*1.9\* \| automake\*1.1[0-5]\*|' \
+  admin/cvs.sh
+make -f admin/Makefile.common
+
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt3.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath \
            --disable-debug \
            --disable-libkipi \
            --enable-mysql \
-           --enable-pgsql \
-           --with-pqxxlibdir=%{_libdir} \
+           %{?_enable_pgsql} %{?!_enable_pgsql:--disable-pgsql} \
            --with-kexif \
-           --with-showimgdb
-#           --enable-final \
+           -with-showimgdb
 
-make -k %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde
-desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category Viewer \
-  --add-category Graphics \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/%{name}.desktop
+desktop-file-install \
+  --vendor=%{?dt_vendor} --delete-original \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=Viewer \
+  --add-category=Graphics \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/showimg.desktop
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/apps/showimg/convert2png.pl
-#find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %find_lang %{name}
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,14 +128,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc showimg/AUTHORS showimg/COPYING showimg/ChangeLog showimg/NEWS showimg/README
 %{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/%{name}
+%{_datadir}/applications/kde/*showimg.desktop
+%{_datadir}/apps/showimg/
 %{_datadir}/apps/konqueror/servicemenus/*
-%dir %{_datadir}/apps/showimgpart/
-%{_datadir}/apps/showimgpart/showimgpart.rc
+%{_datadir}/apps/showimgpart/
 %{_datadir}/services/showimgpart.desktop
-%{_datadir}/icons/*/*/apps/*
-%{_datadir}/doc/HTML/*/%{name}
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/doc/HTML/*/showimg/
 %{_datadir}/mimelnk/image/*.desktop
 %{_libdir}/kde3/libshowimgpart.*
 %{_libdir}/libshowimgcore.*
@@ -119,12 +147,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/kde3/showimg_kexidb_mysqldriver.*
 %{_datadir}/services/showimg_kexidb_mysqldriver.desktop
 
+%if 0%{?_enable_pgsql:1}
 %files pgsql
 %{_libdir}/kde3/showimg_kexidb_pqxxsqldriver.*
 %{_datadir}/services/showimg_kexidb_pqxxsqldriver.desktop
+%endif
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.5-25
+- FTBFS showimg-0.9.5-22.fc11 (#511576)
+- disable pgsql support for f12+
+- add icon/mime scriptlets
+- %%description/%%summary: s/for KDE//
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


