[gphpedit] update to 0.9.98.RC1
Tom Callaway
spot at fedoraproject.org
Thu Mar 8 17:30:21 UTC 2012
commit 08fff6070875df161be7b2bc10441f20fd6ed1de
Author: Tom Callaway <spot at fedoraproject.org>
Date: Thu Mar 8 12:30:18 2012 -0500
update to 0.9.98.RC1
.gitignore | 1 +
gphpedit-0.9.98-gmodule.patch | 39 ++++++++++++++++++++++++++++++++++
gphpedit.spec | 47 ++++++++++++++++++++++++++++------------
sources | 2 +-
4 files changed, 74 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7f8afe..524a23b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gphpedit-0.9.95-dev.tar_.gz
+/gphpedit-0.9.98RC1.tar.gz
diff --git a/gphpedit-0.9.98-gmodule.patch b/gphpedit-0.9.98-gmodule.patch
new file mode 100644
index 0000000..bd8fdd6
--- /dev/null
+++ b/gphpedit-0.9.98-gmodule.patch
@@ -0,0 +1,39 @@
+diff -up anoopjohn-gphpedit-fe8a12c/configure.ac.gmodule anoopjohn-gphpedit-fe8a12c/configure.ac
+--- anoopjohn-gphpedit-fe8a12c/configure.ac.gmodule 2012-03-08 12:10:12.255083721 -0500
++++ anoopjohn-gphpedit-fe8a12c/configure.ac 2012-03-08 12:11:00.535679835 -0500
+@@ -79,12 +79,15 @@ GCONF_REQUIRED_VERSION=2.0.0
+
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION)
++PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
+ PKG_CHECK_MODULES(WEBKIT,[webkit-1.0])
+
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ AC_SUBST(GCONF_CFLAGS)
+ AC_SUBST(GCONF_LIBS)
++AC_SUBST(GMODULE_CFLAGS)
++AC_SUBST(GMODULE_LIBS)
+ AC_SUBST(WEBKIT_CFLAGS)
+ AC_SUBST(WEBKIT_LIBS)
+
+diff -up anoopjohn-gphpedit-fe8a12c/src/Makefile.am.gmodule anoopjohn-gphpedit-fe8a12c/src/Makefile.am
+--- anoopjohn-gphpedit-fe8a12c/src/Makefile.am.gmodule 2012-03-08 12:11:27.125457403 -0500
++++ anoopjohn-gphpedit-fe8a12c/src/Makefile.am 2012-03-08 12:11:59.273188461 -0500
+@@ -26,7 +26,7 @@
+ bin_PROGRAMS = gphpedit
+
+ AM_CFLAGS = \
+- $(WEBKIT_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) \
++ $(WEBKIT_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) $(GMODULE_CFLAGS) \
+ -I$(top_srcdir)/src/gtkscintilla2 \
+ -Wall -DGTK -DSCI_LEXER \
+ -DPIXMAP_DIR=\""$(datadir)/pixmaps"\"
+@@ -92,6 +92,6 @@ gtkscintilla2/libgtkscintilla2.a:
+ cd gtkscintilla2 && $(MAKE) libgtkscintilla2.a && cd ..
+
+ gphpedit_LDADD = \
+- $(WEBKIT_LIBS) $(GTK_LIBS) $(GCONF_LIBS)\
++ $(WEBKIT_LIBS) $(GTK_LIBS) $(GCONF_LIBS) $(GMODULE_LIBS)\
+ gtkscintilla2/libgtkscintilla2.a\
+ gtkscintilla2/scintilla/bin/scintilla.a
diff --git a/gphpedit.spec b/gphpedit.spec
index 30d7f19..095c14c 100644
--- a/gphpedit.spec
+++ b/gphpedit.spec
@@ -1,25 +1,31 @@
+%global prerel RC1
+
Name: gphpedit
-Version: 0.9.95
-Release: 0.4.20090209snap%{?dist}
+Version: 0.9.98
+Release: 0.1.%{prerel}%{?dist}
Summary: A PHP source editor for GNOME 2
Group: Applications/Text
License: GPLv2+
URL: http://www.gphpedit.org/
-Source0: http://www.gphpedit.org/system/files/gphpedit-%{version}-dev.tar_.gz
+Source0: http://www.gphpedit.org/system/files/gphpedit-%{version}%{prerel}.tar.gz
Patch0: gphpedit-0.9.95-manual-en.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gtkhtml2-devel libgnomeui-devel perl-XML-Parser gnome-vfs2-devel
+Patch1: gphpedit-0.9.98-gmodule.patch
+# BuildRequires: gtkhtml2-devel
+BuildRequires: webkitgtk-devel libgnomeui-devel perl-XML-Parser gnome-vfs2-devel
BuildRequires: desktop-file-utils
+BuildRequires: libtool, autoconf, automake
%description
gPHPEdit is a GNOME2 editor dedicated to editing PHP files and other
supporting files such as HTML/CSS.
%prep
-%setup -q -n %{name}
-%patch0 -p1
+# Hint: Upstream is doing it wrong here. This naming is absurd.
+%setup -q -n anoopjohn-gphpedit-fe8a12c
+# %patch0 -p1
+%patch1 -p1 -b .gmodule
+autoreconf -v -i -f
%build
# Remove precompiled binaries and rebuild (statically) bundled gtkscintilla2
@@ -50,7 +56,6 @@ Version=1.0
EOF
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# Remove the desktop file installed by the package itself
@@ -62,21 +67,35 @@ desktop-file-install --vendor fedora \
--add-category X-Fedora \
gphpedit.desktop
+%find_lang %{name}
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%clean
-rm -rf %{buildroot}
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%files
-%defattr(-,root,root,-)
+
+%files -f %{name}.lang
%doc AUTHORS ChangeLog COPYING README
%dir %{_datadir}/gphpedit
%{_bindir}/gphpedit
-%{_datadir}/pixmaps/gphpedit.png
+%{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/pixmaps/*.png
%{_datadir}/applications/fedora-gphpedit.desktop
%{_datadir}/gphpedit/php-gphpedit.api
%changelog
+* Thu Mar 8 2012 Tom Callaway <spot at fedoraproject.org> - 0.9.98-0.1.RC1
+- update to 0.9.98-0.1.RC1
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.95-0.4.20090209snap
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index f8267b6..fa365d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ebacbe9b9512976f5ca7fad3e436f5e5 gphpedit-0.9.95-dev.tar_.gz
+cc3c5f50704fa0ed3ef3d4ac983db525 gphpedit-0.9.98RC1.tar.gz
More information about the scm-commits
mailing list