rpms/kasablanca/FC-4 kasablanca.spec,1.11,1.12

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kasablanca.spec	19 Jan 2006 15:59:20 -0000	1.11
+++ kasablanca.spec	13 Apr 2006 21:00:07 -0000	1.12
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -40,7 +40,7 @@
 
 # Needed(?) for older/legacy setups, harmless otherwise
 if pkg-config openssl ; then
-  export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
 fi
 
 %configure \
@@ -56,14 +56,15 @@
 
 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 "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -108,13 +109,19 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
 - drop x-modular hack(s) (kdelibs-devel fixed)
 - .desktop: GenericName=FTP client