rpms/skrooge/F-11 skrooge-0.5.2-docs.patch, NONE, 1.1 skrooge.spec, 1.4, 1.5

[thomasj]

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18696

Modified Files:
	skrooge.spec 
Added Files:
	skrooge-0.5.2-docs.patch 
Log Message:
Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
(HTML) docs patch, use %%find_lang --with-kde
own %%{_kde4_appsdir}/skrooge*/ dirs
%check: omit extraneous desktop-file-validate's


skrooge-0.5.2-docs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE skrooge-0.5.2-docs.patch ---
diff -up skrooge-0.5.2/doc/CMakeLists.txt.docs skrooge-0.5.2/doc/CMakeLists.txt
--- skrooge-0.5.2/doc/CMakeLists.txt.docs	2009-10-04 09:13:16.000000000 -0500
+++ skrooge-0.5.2/doc/CMakeLists.txt	2009-10-14 09:26:30.731528095 -0500
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR skrooge)


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/skrooge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- skrooge.spec	8 Oct 2009 20:31:58 -0000	1.4
+++ skrooge.spec	14 Oct 2009 16:28:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -9,6 +9,8 @@ URL:            http://extragear.kde.org
 Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+Patch100: skrooge-0.5.2-docs.patch
 
 BuildRequires:  qca2-devel
 BuildRequires:  libofx-devel
@@ -40,6 +42,8 @@ Skrooge libraries
 %prep
 %setup -q
 
+%patch100 -p1 -b .docs
+
 ## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
 chmod -x skrooge_search/skgalarmboardwidget.h
 
@@ -55,7 +59,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
-%find_lang %{name}
+%find_lang %{name} --with-kde
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -73,11 +77,7 @@ rm -f %{buildroot}%{_kde4_libdir}/kde4/p
 rm -rf %{buildroot}
 
 %check
-for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
-    desktop-file-validate $i ; 
-done
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
-desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 
 %post libs -p /sbin/ldconfig
 
@@ -106,29 +106,24 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_docdir}/HTML/en/doc/*
-%{_kde4_docdir}/HTML/sv/%{name}/*
-%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
-%{_kde4_appsdir}/skrooge/images/*/*
-%{_kde4_appsdir}/skrooge/resources/*
-%{_kde4_appsdir}/skrooge/theme/default.css
-%{_kde4_appsdir}/skrooge_*/*
+%{_kde4_appsdir}/skrooge*/
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 %{_kde4_datadir}/mime/packages/x-skg.xml
-%{_kde4_appsdir}/skrooge/images/splash.png
-%{_kde4_appsdir}/skrooge/skrooge.notifyrc
-%{_kde4_appsdir}/skrooge/skrooge.rc
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/plugins/designer/*.so*
+%{_kde4_libdir}/kde4/plugins/designer/*.so.*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/*.so*
+%{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
+- (HTML) docs patch, use %%find_lang --with-kde
+- own %%{_kde4_appsdir}/skrooge*/ dirs
+- %check: omit extraneous desktop-file-validate's
+
 * Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
 - Changed to final 0.5.2 version
 - Bugfixes, including a nasty bug where one thinks the data is gone