- version up to 0.10, removed patch already in mainstream

Changed files:
    geany-doc_dir.patch -> 1.4
    geany-ldadd.patch -> 1.2
    geany.spec -> 1.17

diff --git a/geany-doc_dir.patch b/geany-doc_dir.patch
index 860b81ab3895afb8b524d181b53bf589356131a4..6880063105e80219e47e57fb826747d9d38a87e0 100644 (file)
--- a/geany-doc_dir.patch
+++ b/geany-doc_dir.patch
@@ -30,6 +30,6 @@ diff -aurN geany-0.8.orig/src/main.c geany-0.8/src/main.c
        data_dir = g_strdup(PACKAGE_DATA_DIR "/" PACKAGE "/"); // e.g. /usr/share/geany
 -      doc_dir = g_strdup(PACKAGE_DATA_DIR "/doc/" PACKAGE "/html/");
 +      doc_dir = g_strdup(PACKAGE_DATA_DIR "/" PACKAGE "/doc/html/");
-       locale_dir = g_strdup(PACKAGE_LOCALE_DIR);
  #endif
  
+ 

diff --git a/geany-ldadd.patch b/geany-ldadd.patch
deleted file mode 100644 (file)
index b5c22d7..0000000
--- a/geany-ldadd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN geany-0.8.orig/src/Makefile.am geany-0.8/src/Makefile.am
---- geany-0.8.orig/src/Makefile.am     2006-08-09 20:15:43.000000000 +0200
-+++ geany-0.8/src/Makefile.am  2006-08-12 18:08:22.012690793 +0200
-@@ -58,7 +58,7 @@
- AM_CFLAGS = -Wall -pipe
- #AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -g -O0
- geany_SOURCES = $(SRCS) vte.c vte.h
--geany_LDADD = @PACKAGE_LIBS@ -lstdc++ ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a $(INTLLIBS)
-+geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @PACKAGE_LIBS@ -lstdc++ $(INTLLIBS)
- 
- INCLUDES = \
-       -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \

diff --git a/geany.spec b/geany.spec
index efd87495442eb6c605f4032196993464f8703983..f09e4446cdf2555f17b755ca21b06a2d5fdd35b1 100644 (file)
--- a/geany.spec
+++ b/geany.spec
@@ -1,15 +1,14 @@
 Summary:       Fast and lightweight IDE using GTK+2
 Summary(pl):   Szybkie i lekkie IDE u¿ywaj±ce GTK+2
 Name:          geany
-Version:       0.8
-Release:       2
+Version:       0.10
+Release:       1
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       http://dl.sourceforge.net/geany/%{name}-%{version}.tar.bz2
-# Source0-md5: adffe7b71983f897eec449d50312f2c8
+# Source0-md5: 2ffaae9b0fa807bdd4be0e6ec0f4a2e5
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-doc_dir.patch
-Patch2:                %{name}-ldadd.patch
 URL:           http://geany.uvena.de/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -59,7 +58,6 @@ Podstawowe cechy Geany to:
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__glib_gettextize}
@@ -76,6 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT/%{_pixmapsdir}/%{name}.ico
+
 %find_lang %{name}
 
 %clean
@@ -84,8 +84,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README THANKS TODO scintilla/License.txt
-%attr(755,root,root) %{_bindir}/geany
-%{_desktopdir}/geany.desktop
+%attr(755,root,root) %{_bindir}/%{name}
+%{_desktopdir}/%{name}.desktop
 %{_datadir}/%{name}
-%{_pixmapsdir}/geany.png
-%{_mandir}/man1/geany.1*
+%{_pixmapsdir}/%{name}.png
+%{_mandir}/man1/%{name}.1*