rpms/scribes/devel scribes-configure.ac-no-python-depcheck.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 scribes.spec, 1.7, 1.8 sources, 1.3, 1.4 scribes-setup-install-gconf-schemas.patch, 1.1, NONE scribes-setup-no-dep-check.patch, 1.1, NONE scribes-setup-no-manual-gconf.patch, 1.1, NONE
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Sun Oct 15 23:24:46 UTC 2006
Author: pgordon
Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5750
Modified Files:
.cvsignore scribes.spec sources
Added Files:
scribes-configure.ac-no-python-depcheck.patch
Removed Files:
scribes-setup-install-gconf-schemas.patch
scribes-setup-no-dep-check.patch
scribes-setup-no-manual-gconf.patch
Log Message:
Update to new upstream version (0.2.9.87)
scribes-configure.ac-no-python-depcheck.patch:
--- NEW FILE scribes-configure.ac-no-python-depcheck.patch ---
--- configure.ac.orig 2006-10-15 14:04:26.000000000 -0700
+++ configure.ac 2006-10-15 14:06:14.000000000 -0700
@@ -3,8 +3,6 @@
AC_INIT([scribes], [0.2.9.87], [<mystilleef at gmail.com>])
-AC_PREREQ(2.60)
-
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([configure.ac])
AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip])
@@ -22,9 +20,6 @@
AM_GNU_GETTEXT_VERSION
AM_PATH_PYTHON([2.4])
-AC_LANG([C])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [AC_MSG_RESULT([It worked])], [AC_MSG_ERROR([It failed])])
-
AC_CONFIG_FILES([
intl/Makefile
po/Makefile.in
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 13 Jun 2006 04:28:55 -0000 1.3
+++ .cvsignore 15 Oct 2006 23:24:16 -0000 1.4
@@ -1 +1 @@
-scribes-0.2.5.tar.gz
+scribes-0.2.9.87.tar.bz2
Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scribes.spec 27 Aug 2006 22:41:05 -0000 1.7
+++ scribes.spec 15 Oct 2006 23:24:16 -0000 1.8
@@ -1,30 +1,43 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define python_module_name Scribes
+%define python_module_name SCRIBES
Name: scribes
-Version: 0.2.5
-Release: 5%{?dist}
+Version: 0.2.9.87
+Release: 1%{?dist}
Summary: A sleek, simple, and powerful text editor for the GNOME desktop
Group: Applications/Editors
License: GPL
URL: http://scribes.sourceforge.net/
-Source0: http://openusability.org/download.php/93/%{name}-%{version}.tar.gz
-Patch0: %{name}-setup-no-dep-check.patch
-Patch1: %{name}-setup-install-gconf-schemas.patch
-Patch2: %{name}-setup-no-manual-gconf.patch
-BuildArch: noarch
+Source0: http://heanet.dl.sourceforge.net/scribes/scribes-%{version}.tar.bz2
+Patch0: %{name}-configure.ac-no-python-depcheck.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
BuildRequires: desktop-file-utils
-Requires: gnome-python2-gtkspell >= 2.12
-Requires: gnome-python2-gtksourceview >= 2.12
-Requires: pygtk2 >= 2.8
+BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: scrollkeeper
+BuildRequires: autoconf
+BuildRequires: gnome-doc-utils
+BuildRequires: GConf2
+
+Requires: dbus-python >= 0.60
+Requires: pygobject2
+Requires: pygtk2 >= 2.10
+Requires: python >= 2.4
Requires: gnome-python2-gconf >= 2.12
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(post): scrollkeeper
+Requires: gnome-python2-gnomeprint >= 2.12
+Requires: gnome-python2-gnomevfs >= 2.12
+Requires: gnome-python2-gtksourceview >= 2.12
+Requires: gnome-python2-gtkspell >= 2.12
+Requires: PyXML
+Requires: python-psyco
+
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(post): scrollkeeper
Requires(preun): GConf2
Requires(postun): scrollkeeper
@@ -49,15 +62,22 @@
In order to make use of its runtime documentation facilities, you will need to
install Yelp.
+
%prep
%setup -q
+# Patch out the configure script's call to depcheck.py, since I've ensured
+# that the deps are satisfied and the depcheck.py script is happy on its own,
+# though fails when run through rpmbuild...
%patch0 -p0
-%patch1 -p0
-%patch2 -p0
+# ..then recreate the configure script from the new configure.ac file...
+%{__autoconf}
+# ...and now configure it. Scrollkeeper and GConf schema stuff are disabled
+# since they'll be installed with the scriptlets.
+%configure --disable-scrollkeeper --disable-schemas-install
%build
-%{__python} setup.py build
+make %{?_smp_mflags}
%pre
@@ -70,15 +90,12 @@
%install
rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%find_lang %{name}
+make DESTDIR=%{buildroot} install
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
--delete-original \
%{buildroot}/%{_datadir}/applications/%{name}.desktop
-chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/findbar.py
-chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
%post
@@ -87,6 +104,10 @@
%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
%clean
@@ -103,26 +124,38 @@
%postun
update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+scrollkeeper-update -q ||:
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG README TODO TRANSLATORS COPYING
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{python_sitelib}/%{python_module_name}
%{_bindir}/%{name}
-%dir %{python_sitelib}/%{python_module_name}
-%{python_sitelib}/%{python_module_name}/*.py
-%{python_sitelib}/%{python_module_name}/*.pyc
-%{python_sitelib}/%{python_module_name}/*.pyo
+%{_bindir}/.scribesclient
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.svg
-%{_datadir}/application-registry/%{name}.application
%{_datadir}/gnome/help/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/omf/%{name}/
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
%changelog
+* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
+- Update to new upstream version
+- Add patch to bypass failure in depcheck.py call:
+ + configure.ac-no-python-depcheck.patch
+- Drop old patches, no longer needed:
+ - setup-no-manual-gconf.patch
+ - setup-install-gconf-schemas.patch
+ - setup-no-dep-check.patch
+
* Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.5-5
- Mass FC6 rebuild
@@ -150,7 +183,8 @@
- Thanks to Brian Pepple (Bug #189727).
* Tue Apr 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.4.3-2
-- Added patch to remove unnecessary gconf foo in the setup.py script.
+- Added patch to remove unnecessary gconf foo in the setup.py script:
+ + setup-no-manual-gconf.patch
- Fix a few spacing inconsistencies in the .spec file.
* Sat Apr 22 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.4.3-1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 13 Jun 2006 04:28:55 -0000 1.3
+++ sources 15 Oct 2006 23:24:16 -0000 1.4
@@ -1 +1 @@
-5e9d0b7cda17069042e5d8e8c4f32692 scribes-0.2.5.tar.gz
+428458fd6f6a457b6e2d693f8cd1c6d3 scribes-0.2.9.87.tar.bz2
--- scribes-setup-install-gconf-schemas.patch DELETED ---
--- scribes-setup-no-dep-check.patch DELETED ---
--- scribes-setup-no-manual-gconf.patch DELETED ---
More information about the scm-commits
mailing list