rpms/geany/F-8 geany.spec,1.14,1.15 sources,1.6,1.7

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/geany/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3665

Modified Files:
	geany.spec sources 
Log Message:
* Sun May 11 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.14-1
- Update to 0.14
- New -devel sub-package for header files
- Corectly remove the .la libtool files
- Remove hack relating to finding the system installed html files
- No longer correct the desktop file



Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/F-8/geany.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geany.spec	24 Mar 2008 13:38:19 -0000	1.14
+++ geany.spec	11 May 2008 17:06:54 -0000	1.15
@@ -1,6 +1,6 @@
 Name:      geany
-Version:   0.13
-Release:   2%{?dist}
+Version:   0.14
+Release:   1%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -29,17 +29,17 @@
 - many supported filetypes like C, Java, PHP, HTML, Python, Perl, Pascal
 - symbol lists
 
-%prep
-%setup -q
+%package devel
+Summary:   Header files for building Geany plug-ins
+Group:     Development/Tools
+Requires:  geany = %{version}-%{release}
 
-# Fix incorrect version entry in desktop file
-sed -i -e 's/Version=1.1/Version=1.0/' geany.desktop.in.in
+%description devel
+This package contains the header files and pkg-config file needed for building
+Geany plug-ins. You do not need to install this package to use Geany.
 
-# Fix docdir brutally for 0.13 - --docdir isn't proerly handled by configure
-# XXX This should be removed for 0.14
-pushd src
-sed -i -e 's|/doc/geany/html|/doc/geany-%{version}/html|' main.c
-popd
+%prep
+%setup -q
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -57,7 +57,7 @@
 %find_lang %{name}
 
 # Remove static library *.la files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/geany/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,7 +73,19 @@
 %{_datadir}/doc/%{name}-%{version}
 %{_mandir}/man1/geany.1.gz
 
+%files devel
+%defattr(-, root, root, -)
+%{_includedir}/geany
+%{_libdir}/pkgconfig/geany.pc
+
 %changelog
+* Sun May 11 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.14-1
+- Update to 0.14
+- New -devel sub-package for header files
+- Corectly remove the .la libtool files
+- Remove hack relating to finding the system installed html files
+- No longer correct the desktop file
+
 * Mon Mar 24 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.13-2
 - Fix docdir/doc_dir so geany correctly finds the system installed html docs (BZ
   438534) 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geany/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Feb 2008 14:13:32 -0000	1.6
+++ sources	11 May 2008 17:06:54 -0000	1.7
@@ -1 +1 @@
-0dc4f30b5ee9132f136fd3e7e4f02e0c  geany-0.13.tar.bz2
+c6c22c7f9feff81a15f5c8ece03b87c1  geany-0.14.tar.bz2