rpms/geany/F-12 geany.spec,1.35,1.36

[Dominic Hopf]

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13913

Modified Files:
	geany.spec 
Log Message:
- improve handling of documentation directory
- add upstream comment about the desktopfile patch




Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-12/geany.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- geany.spec	15 Apr 2010 16:57:47 -0000	1.35
+++ geany.spec	18 Apr 2010 09:46:42 -0000	1.36
@@ -1,6 +1,8 @@
+%global geany_docdir %{_docdir}/%{name}-%{version}
+
 Name:      geany
 Version:   0.18.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -22,6 +24,7 @@ Source10:  http://download.geany.org/con
 Source11:  http://download.geany.org/contrib/tags/libxml-2.0.c.tags
 Source12:  http://advamacs.com/pub/tcl.tcl.tags
 
+# The patch is already applied in upstream SVN
 Patch0:    geany-0.18.1-geany.desktop.in-remove-asterisk-and-add-mimetypes-for-php3-php4-php5.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +33,6 @@ BuildRequires: desktop-file-utils, gette
 BuildRequires: perl(XML::Parser)
 Requires: vte
 
-%define geany_docdir $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
 %description
 Geany is a small and fast integrated development enviroment with basic
@@ -70,18 +72,17 @@ rm -f wscript
 
 
 %build
-%configure --docdir=%{_docdir}/%{name}-%{version}
+%configure --docdir=%{geany_docdir}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{geany_docdir}
+make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=$RPM_BUILD_ROOT/%{geany_docdir}
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.ico
-desktop-file-install --delete-original \
+desktop-file-install --delete-original --vendor="fedora"        \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --mode 0644                                             \
         $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-sed -i 's/\r//' %{geany_docdir}/ScintillaLicense.txt
 %find_lang %{name}
 
 # Remove static library *.la files
@@ -89,7 +90,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/geany/*
 
 # Install tags files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
-install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
+install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4}  %{SOURCE5}  %{SOURCE6} \
+           %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12}\
+           $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -108,13 +111,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
+%exclude %{geany_docdir}/TODO
+
+%doc %{geany_docdir}
 %doc %{_mandir}/man1/geany.1.*
 
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_libdir}/%{name}
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/*.png
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
@@ -127,10 +132,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Apr 18 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18.1-3
+- improve handling of documentation directory
+- add upstream comment about the desktopfile patch
+
 * Thu Apr 15 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18.1-2
 - move TODO and HACKING into devel package
 - add patch to fix mimetypes in desktop-file
-- remove vendor fedora from desktopfile
 - add Tcl tags
 - replace the .gz of manpage with wildcard