rpms/gwenview/devel .cvsignore, 1.2, 1.3 gwenview.spec, 1.3, 1.4 sources, 1.2, 1.3

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17804/devel

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
auto-import gwenview-1.1.6-2 on branch devel from gwenview-1.1.6-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:33:13 -0000	1.2
+++ .cvsignore	29 Jan 2005 23:45:57 -0000	1.3
@@ -1 +1 @@
-gwenview-1.0.1.tar.bz2
+gwenview-1.1.6.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gwenview.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gwenview.spec	29 Jan 2005 23:45:57 -0000	1.4
@@ -1,32 +1,20 @@
-
-# Fedora Core 2 support.
-%define fedora_release %(if test -n "$(rpm -ql fedora-release | grep -m1 etc)";  then rpm -q --qf "%%{version}" fedora-release; else echo 0; fi )
-%if "%fedora_release" > "1"
-%define target_kde32 1
-%endif
-%{?_with_kde32: %define target_kde32 1}
-
 Name:           gwenview
-Version:        1.0.1
-Release:        4
+Version:        1.1.6
+Release:        2
 Epoch:          0
 Summary:        Simple image viewer for KDE.
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.0.1.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-1.1.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel >= 6:3.0.0, arts-devel
-BuildRequires:  XFree86-devel, zlib-devel, libjpeg-devel
-BuildRequires:  libart_lgpl-devel, desktop-file-utils
-BuildRequires:  libpng-devel, gettext
-
-%if 0%{?target_kde32}
-BuildRequires:  libmng-devel fam-devel glib2-devel
-%endif
-
+BuildRequires:  kdelibs-devel >= 6:3.1
+BuildRequires:  desktop-file-utils
+BuildRequires:  libkipi-devel
+BuildRequires:  gettext
+#BuildRequires:  fam-devel glib2-devel
 
 %description
 Gwenview is an image viewer for KDE. 
@@ -38,14 +26,15 @@
 
 %prep
 %setup -q
-perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop
 perl -pi -e 's,Commend\[ko\]=,Comment\[ko\]=,' desktopfiles/gwenview.desktop
+#perl -pi -e 's,Categories=Qt;KDE;Graphics,Categories=Qt;KDE;Graphics;,' desktopfiles/gwenview.desktop
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-rpath \
            --disable-debug \
-           --enable-final
+           --enable-kipi
+# --enable-final  \
 make %{?_smp_mflags}
 
 
@@ -54,22 +43,19 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
   --add-category X-Fedora \
   --add-category Application \
   --add-category Viewer \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-# KDE 3.2:
-%if 0%{?target_kde32}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde
-mv $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/kde/
-%endif
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso}
+%find_lang %{name}
 
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{xx,ven,nso}
+%post -p /sbin/ldconfig
 
-%find_lang %{name}
+%postun -p /sbin/ldconfig
 
 
 %clean
@@ -80,18 +66,24 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO CREDITS
 %{_bindir}/*
-%if 0%{?target_kde32}
 %{_datadir}/applications/kde/*.desktop
-%else
-%{_datadir}/applications/*.desktop
-%endif
 %{_datadir}/apps/konqueror/servicemenus/*
 %{_datadir}/icons/*/*/apps/*
-%{_datadir}/apps/%{name}
+%{_datadir}/apps/*
+%{_datadir}/services/*.desktop
 %{_mandir}/man1/*
+%{_libdir}/lib*
+%{_libdir}/kde3/lib*
 
 
 %changelog
+* Wed Nov 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.1.6-2
+- remove hardcoded requirement to kipi-plugins
+
+* Mon Oct 25 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.1.6-0.fdr.1
+- version 1.1.6
+- drop FC1 support
+
 * Wed Mar 17 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.1-0.fdr.4
 - fix typo in desktop file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:33:13 -0000	1.2
+++ sources	29 Jan 2005 23:45:57 -0000	1.3
@@ -1 +1 @@
-98bc89e3bda282cf192f84bd1fc03fdf  gwenview-1.0.1.tar.bz2
+2c1bf6f363165273350888e0a7e00168  gwenview-1.1.6.tar.bz2