rpms/gphpedit/devel gphpedit-0.9.91-manual-en.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gphpedit.spec, 1.3, 1.4 sources, 1.2, 1.3 needs.rebuild, 1.1, NONE
Tim Jackson (timj)
fedora-extras-commits at redhat.com
Sat Sep 9 15:11:37 UTC 2006
Author: timj
Update of /cvs/extras/rpms/gphpedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11415
Modified Files:
.cvsignore gphpedit.spec sources
Added Files:
gphpedit-0.9.91-manual-en.patch
Removed Files:
needs.rebuild
Log Message:
Update to 0.9.91
gphpedit-0.9.91-manual-en.patch:
--- NEW FILE gphpedit-0.9.91-manual-en.patch ---
diff -ur gphpedit-0.9.91.orig/src/tab.c gphpedit-0.9.91/src/tab.c
--- gphpedit-0.9.91.orig/src/tab.c 2006-07-05 15:15:21.000000000 +0100
+++ gphpedit-0.9.91/src/tab.c 2006-09-09 14:42:06.000000000 +0100
@@ -532,13 +532,13 @@
GString *long_filename = NULL;
// For Redhat/Fedora Core and other sensible distrubutions...
- long_filename = tab_help_try_filename("/usr/share/doc/phpmanual/function.", command, ".html");
+ long_filename = tab_help_try_filename("/usr/share/doc/php-manual/en/html/function.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/phpmanual/ref.", command, ".html");
+ long_filename = tab_help_try_filename("/usr/share/doc/php-manual/en/html/ref.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/phpmanual/", command, NULL);
+ long_filename = tab_help_try_filename("/usr/share/doc/php-manual/en/html/", command, NULL);
if (long_filename)
return long_filename;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 15 Apr 2006 01:51:25 -0000 1.2
+++ .cvsignore 9 Sep 2006 15:11:37 -0000 1.3
@@ -1 +1 @@
-gphpedit-0.9.80.tar.gz
+gphpedit-0.9.91.tar.gz
Index: gphpedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/gphpedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gphpedit.spec 28 Jun 2006 09:53:38 -0000 1.3
+++ gphpedit.spec 9 Sep 2006 15:11:37 -0000 1.4
@@ -1,15 +1,16 @@
Name: gphpedit
-Version: 0.9.80
-Release: 5%{?dist}
+Version: 0.9.91
+Release: 3%{?dist}
Summary: A PHP source editor for GNOME 2
Group: Applications/Text
License: GPL
URL: http://www.gphpedit.org/
Source0: gphpedit-%{version}.tar.gz
+Patch0: gphpedit-0.9.91-manual-en.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtkhtml2-devel libgnomeui-devel intltool
+BuildRequires: gtkhtml2-devel libgnomeui-devel perl-XML-Parser
BuildRequires: desktop-file-utils
%description
@@ -18,13 +19,9 @@
%prep
%setup -q
-
-# This path is hardcoded and doesn't inherit from the configure
-# (see upstream bug #155 )
-sed -i s_/usr/local/share/pixmaps_%{_datadir}/pixmaps_ src/main.h
+%patch0 -p1
# The .desktop file included isn't Free Desktop compliant
-# (Fixed upstream in CVS)
%{__cat} <<EOF >gphpedit.desktop
[Desktop Entry]
Encoding=UTF-8
@@ -40,11 +37,12 @@
EOF
%build
-# Remove precompiled binaries and rebuild bundled gtkscintilla2
-# (bundling is intentional and with good cause)
+# Remove precompiled binaries and rebuild (statically) bundled gtkscintilla2
+# (bundling is intentional and with good cause: it is a modified version
+# and the upstream project is apparently dead)
pushd src/gtkscintilla2
make clean
-make %{?_smp_mflags}
+make libgtkscintilla2.a %{?_smp_mflags}
popd
# Configure and make main binary
@@ -80,8 +78,18 @@
%{_datadir}/gphpedit/php-gphpedit.api
%changelog
-* Wed Jun 18 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-5
-- Add missing BR on intltool (fixes build on FC6)
+* Sat Sep 09 2006 Tim Jackson <rpm at timj.co.uk> 0.9.91-3
+- Only rebuild bundled gtkscintilla2 as static library (avoids PIC error on
+ x86_64, plus saves time)
+
+* Sat Sep 09 2006 Tim Jackson <rpm at timj.co.uk> 0.9.91-2
+- Add missing perl-XML-Parser BR
+
+* Sat Sep 09 2006 Tim Jackson <rpm at timj.co.uk> 0.9.91-1
+- Update to 0.9.91
+- Remove pixmap path hack; now fixed upstream
+- Patch to support context-sensitive display of PHP manual function help (F1)
+ if the php-manual-en package is installed
* Mon Apr 17 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-4
- Ensure bundled gtkscintilla2 is rebuilt instead of using precompiled
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Apr 2006 01:51:25 -0000 1.2
+++ sources 9 Sep 2006 15:11:37 -0000 1.3
@@ -1 +1 @@
-f05e6354ea64c73dd7bfe020ae15ac71 gphpedit-0.9.80.tar.gz
+eecd29e66b415246408b285f4edcb6a0 gphpedit-0.9.91.tar.gz
--- needs.rebuild DELETED ---
More information about the fedora-extras-commits
mailing list