rpms/apollon/FC-4 apollon-1.0.1-firstrun.patch, NONE, 1.1 apollon.spec, 1.1, 1.2

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/apollon/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7795

Modified Files:
	apollon.spec 
Added Files:
	apollon-1.0.1-firstrun.patch 
Log Message:
* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-5
- firstrun patch (#185258)


apollon-1.0.1-firstrun.patch:

--- NEW FILE apollon-1.0.1-firstrun.patch ---
--- apollon-1.0.1/apollon/firstrun.ui.h.firstrun	2004-10-13 11:33:15.000000000 -0500
+++ apollon-1.0.1/apollon/firstrun.ui.h	2006-03-13 10:53:45.000000000 -0600
@@ -51,7 +51,7 @@
 		
 		//where are the plugins installed?
 		QDir installedPath ("/usr/share/giFT/giftd.conf.template");
-		if (installedPath.exists()) {
+		if (QFile::exists(installedPath.path())) {
 			installedPath = "/usr/share/giFT/";
 		}
 		else {


Index: apollon.spec
===================================================================
RCS file: /cvs/extras/rpms/apollon/FC-4/apollon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apollon.spec	20 Dec 2005 15:14:06 -0000	1.1
+++ apollon.spec	13 Mar 2006 17:41:30 -0000	1.2
@@ -2,7 +2,7 @@
 Summary: Filesharing client
 Name:	 apollon
 Version: 1.0.1
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group: 	 Applications/Internet
@@ -13,15 +13,13 @@
 # Fix Name/GenericName, append ; to Categories, 
 # remove lines containing non UTF-8 chars ([de] entries)
 Patch1: apollon-1.0.1-dtfix.patch 
+# http://bugzilla.redhat.com/bugzilla/185258
+Patch2: apollon-1.0.1-firstrun.patch
 
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: gift-devel
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
-# Hack/woraround kdelibs-devel bug: https://bugzilla.redhat.com/bugzilla/170602
-BuildRequires: libacl-devel
+BuildRequires: kdelibs-devel 
 
 %description
 A filesharing client which uses giFT.
@@ -31,12 +29,11 @@
 %setup -q 
 
 %patch1 -p1 -b .dtfix
-
+%patch2 -p1 -b .firstrun
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -51,11 +48,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --delete-original --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category Application \
-  --add-category X-Fedora \
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+  --vendor="fedora" --delete-original \
+  --add-category="X-Fedora" \
   $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
 
 ## File lists
@@ -112,6 +108,15 @@
 
 
 %changelog
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-5
+- firstrun patch (#185258)
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-4
+- drop libacl hack
+
 * Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-3
 - BR: libacl-devel (workaround kdelibs bug #170602)