rpms/file-browser-applet/devel fba-libdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 file-browser-applet.spec, 1.2, 1.3 sources, 1.2, 1.3

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/file-browser-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1175

Modified Files:
	.cvsignore file-browser-applet.spec sources 
Added Files:
	fba-libdir.patch 
Log Message:
* Sat Aug 30 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.8-1
- Update to 0.5.8


fba-libdir.patch:

--- NEW FILE fba-libdir.patch ---
--- CMakeLists.txt	2008-08-29 11:38:24.000000000 -0400
+++ CMakeLists.txt.new	2008-08-29 16:20:56.000000000 -0400
@@ -12,8 +12,13 @@
 ENDIF (NOT DEFINED CMAKE_INSTALL_PATH)
 MESSAGE ("Using CMAKE_INSTALL_PATH=${CMAKE_INSTALL_PATH}")
 
+IF (NOT DEFINED CMAKE_LIB_DESTINATION)
+	SET (CMAKE_LIB_DESTINATION "${CMAKE_INSTALL_PATH}/lib")
+ENDIF (NOT DEFINED CMAKE_LIB_DESTINATION)
+MESSAGE ("Using CMAKE_LIB_DESTINATION=${CMAKE_LIB_DESTINATION}")
+
 IF (NOT DEFINED CMAKE_INSTALL_LIB_DIR)
-	SET (CMAKE_INSTALL_LIB_DIR "${CMAKE_INSTALL_PATH}/lib/${EXEC}")
+	SET (CMAKE_INSTALL_LIB_DIR "${CMAKE_LIB_DESTINATION}/${EXEC}")
 ENDIF (NOT DEFINED CMAKE_INSTALL_LIB_DIR)
 MESSAGE ("Using CMAKE_INSTALL_LIB_DIR=${CMAKE_INSTALL_LIB_DIR}")

--- data/CMakeLists.txt	2008-08-29 11:38:24.000000000 -0400
+++ data/CMakeLists.txt.new	2008-08-29 16:20:40.000000000 -0400
@@ -6,7 +6,7 @@
 				${FILE_BROWSER_APPLET_SOURCE_DIR}/data/${SERVER})
 
 INSTALL (FILES ${SCHEMA}  DESTINATION "${CMAKE_INSTALL_GCONF_SCHEMA_DIR}")
-INSTALL (FILES ${SERVER}  DESTINATION "${CMAKE_INSTALL_PATH}/lib/bonobo/servers")
+INSTALL (FILES ${SERVER}  DESTINATION "${CMAKE_LIB_DESTINATION}/bonobo/servers")
 INSTALL (FILES ${GLADEUI} DESTINATION "${CMAKE_INSTALL_GLADEUI_DIR}")
 
 INSTALL (CODE "EXEC_PROGRAM (\"export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && gconftool-2 --makefile-install-rule ${CMAKE_INSTALL_GCONF_SCHEMA_DIR}/${SCHEMA}\")")


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jun 2008 19:33:02 -0000	1.2
+++ .cvsignore	30 Aug 2008 12:33:36 -0000	1.3
@@ -1 +1 @@
-file-browser-applet-0.5.6.tar.gz
+file-browser-applet-0.5.8.tar.gz


Index: file-browser-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/file-browser-applet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file-browser-applet.spec	5 Jun 2008 11:45:14 -0000	1.2
+++ file-browser-applet.spec	30 Aug 2008 12:33:36 -0000	1.3
@@ -1,20 +1,17 @@
 Name:		file-browser-applet
-Version:	0.5.6
-Release:	3%{?dist}
+Version:	0.5.8
+Release:	1%{?dist}
 Summary:	File Browser Applet for the GNOME Panel
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://code.google.com/p/gnome-menu-file-browser-applet/
 Source0:	http://gnome-menu-file-browser-applet.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:		fba-libexecdir.patch
-Patch1:		fba-cflags.patch
+Patch0:		fba-libdir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	cmake >= 2.4.5
-BuildRequires:	gnome-vfs2-devel
+BuildRequires:	cmake >= 2.4.7
 BuildRequires:	libglade2-devel
 BuildRequires:	gnome-panel-devel
-BuildRequires:  gnome-desktop-devel
 Requires(pre):	GConf2
 Requires(post):	GConf2
 Requires(preun):GConf2
@@ -29,8 +26,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .libexec
-%patch1 -p0 -b .flags
+%patch0 -p0 -b .libdir
 
 %build
 mkdir fedora
@@ -39,8 +35,7 @@
 export CXXFLAGS="%{optflags}"
 export FFLAGS="%{optflags}"
 cmake	-DCMAKE_INSTALL_PATH=%{_prefix}			\
-	-DCMAKE_INSTALL_LIB_DIR=%{_libdir}		\
-	-DCMAKE_INSTALL_LIBEXEC_DIR=%{_libexecdir}		\
+	-DCMAKE_LIB_DESTINATION=%{_libdir}		\
 	-DCMAKE_INSTALL_GCONF_SCHEMA_DIR=%{_sysconfdir}/gconf/schemas ..
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -87,13 +82,16 @@
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README
 %{_libdir}/bonobo/servers/GNOME_FileBrowserApplet_Factory.server
-%{_libexecdir}/file-browser-applet
+%{_libdir}/file-browser-applet/
 %{_datadir}/file-browser-applet/
 %{_datadir}/icons/hicolor/128x128/apps/file-browser-applet.png
 %{_datadir}/pixmaps/file-browser-applet.png
 %{_sysconfdir}/gconf/schemas/file-browser-applet.schemas
 
 %changelog
+* Sat Aug 30 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.8-1
+- Update to 0.5.8
+
 * Thu Jun 05 2008 Caolán McNamara <caolanm at redhat.com> - 0.5.6-3
 - rebuild for dependancies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jun 2008 19:33:02 -0000	1.2
+++ sources	30 Aug 2008 12:33:36 -0000	1.3
@@ -1 +1 @@
-ccd2ddc0ca85aaaa8ff66445668912cb  file-browser-applet-0.5.6.tar.gz
+7164949c92fa0fe96b56d733861dc906  file-browser-applet-0.5.8.tar.gz