diff --git a/.cvsignore b/.cvsignore index 4773ea3..be1e038 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -geany-0.13.tar.bz2 +geany-0.14.tar.bz2 diff --git a/geany.spec b/geany.spec index e2796cc..998c643 100644 --- a/geany.spec +++ b/geany.spec @@ -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 @@ Some features: - 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 @@ sed -i 's/\r//' %{geany_docdir}/ScintillaLicense.txt %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 @@ rm -rf $RPM_BUILD_ROOT %{_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 - 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 - 0.13-2 - Fix docdir/doc_dir so geany correctly finds the system installed html docs (BZ 438534) diff --git a/sources b/sources index 608b017..c18ecd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0dc4f30b5ee9132f136fd3e7e4f02e0c geany-0.13.tar.bz2 +c6c22c7f9feff81a15f5c8ece03b87c1 geany-0.14.tar.bz2