rpms/geany/FC-5 geany-find-sonames.patch, NONE, 1.1 geany.spec, 1.2, 1.3 geany-dynamic-vte.patch, 1.1, NONE
Josef Whiter (josef)
fedora-extras-commits at redhat.com
Thu Jan 25 16:13:49 UTC 2007
- Previous message: rpms/lilypond/devel .cvsignore, 1.12, 1.13 lilypond.spec, 1.12, 1.13 sources, 1.12, 1.13
- Next message: rpms/geany/FC-6 geany-find-sonames.patch, NONE, 1.1 geany.spec, 1.2, 1.3 geany-dynamic-vte.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: josef
Update of /cvs/extras/rpms/geany/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29625/FC-5
Modified Files:
geany.spec
Added Files:
geany-find-sonames.patch
Removed Files:
geany-dynamic-vte.patch
Log Message:
adding geany-find-sonames.patch, removing geany-dynamic-vte.patch, fixing requires and buildrequires, aligning with upstream behavior.
geany-find-sonames.patch:
--- NEW FILE geany-find-sonames.patch ---
--- geany-orig/src/vte.c.soname 2007-01-25 06:52:12.000000000 -0500
+++ geany-orig/src/vte.c 2007-01-25 06:52:19.000000000 -0500
@@ -134,11 +134,14 @@ void vte_init(void)
}
else
{
- module = g_module_open("libvte.so", G_MODULE_BIND_LAZY);
- // try to fallback to different versions of libvte.so.x
- if (module == NULL) module = g_module_open("libvte.so.4", G_MODULE_BIND_LAZY);
- else if (module == NULL) module = g_module_open("libvte.so.8", G_MODULE_BIND_LAZY);
- else if (module == NULL) module = g_module_open("libvte.so.9", G_MODULE_BIND_LAZY);
+ gint i;
+ const gchar *sonames[] = { "libvte.so", "libvte.so.4",
+ "libvte.so.8", "libvte.so.9", NULL };
+
+ for (i = 0; sonames[i] != NULL && module == NULL; i++ )
+ {
+ module = g_module_open(sonames[i], G_MODULE_BIND_LAZY);
+ }
}
if (module == NULL)
Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/FC-5/geany.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geany.spec 24 Jan 2007 19:35:45 -0000 1.2
+++ geany.spec 25 Jan 2007 16:13:19 -0000 1.3
@@ -1,18 +1,18 @@
Name: geany
Version: 0.10
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A fast and lightweight IDE using GTK2
Group: Development/Tools
License: GPL
URL: http://geany.uvena.de/
Source0: http://files.uvena.de/geany/%{name}-%{version}.tar.bz2
-Patch0: geany-dynamic-vte.patch
+Patch0: geany-find-sonames.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils, gettext, gtk2-devel, glib2-devel, pango-devel, vte-devel
-BuildRequires: autoconf, automake
+BuildRequires: desktop-file-utils, gettext, gtk2-devel, glib2-devel, pango-devel
+Requires: vte
%define geany_docdir $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
@@ -31,14 +31,12 @@
%prep
%setup -q
-%patch0 -p1 -b .dynvte
+%patch0 -p1 -b .sonames
%build
-autoreconf --force --install
-#%configure
+%configure
make %{?_smp_mflags}
-
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{geany_docdir}
@@ -63,6 +61,12 @@
%{_mandir}/man1/geany.1.gz
%changelog
+* Thu Jan 25 2007 Josef Whiter <josef at toxicpanda.com> 0.10-5
+- removed autoconf/automake/vte-devel from BR as they are not needed
+- removed patch to dynamically link in libvte
+- adding patch to find appropriate libvte library from the vte package
+- added vte as a Requires
+
* Wed Jan 24 2007 Josef Whiter <josef at toxicpanda.com> 0.10-4
- added autoconf and automake as a BR
--- geany-dynamic-vte.patch DELETED ---
- Previous message: rpms/lilypond/devel .cvsignore, 1.12, 1.13 lilypond.spec, 1.12, 1.13 sources, 1.12, 1.13
- Next message: rpms/geany/FC-6 geany-find-sonames.patch, NONE, 1.1 geany.spec, 1.2, 1.3 geany-dynamic-vte.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list