diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | gtk/Makefile.am | 1 | ||||
| -rw-r--r-- | pygtk-2.0.pc.in | 2 | ||||
| -rw-r--r-- | pygtk.spec.in | 10 |
5 files changed, 22 insertions, 4 deletions
@@ -1,3 +1,15 @@ +2001-10-15 Matt Wilson <msw@redhat.com> + + * pygtk-2.0.pc.in (pygtkincludedir): move headers to a + version-specific directory so we can have old pygtk-devel and + pygtk2-devel installed at the same time. + + * Makefile.am (pkgincludedir): likewise + + * gtk/Makefile.am (pkgincludedir): likewise + + * pygtk.spec.in (%files devel): pick up the new header location + 2001-10-11 Matt Wilson <msw@redhat.com> * pygtk.spec.in (%files devel): fixed typo in devel filelist diff --git a/Makefile.am b/Makefile.am index 2999ec93..3f23331a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,6 +32,7 @@ $(srcdir)/pango.c: $(srcdir)/pango.defs $(srcdir)/pango-types.defs \ && rm -f gen-pango.c pkginclude_HEADERS = pygobject.h +pkgincludedir = $(includedir)/pygtk-2.0/pygtk noinst_PYTHON = ltihooks.py diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 8b9db091..d4c15c5c 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -32,6 +32,7 @@ glademodule_la_SOURCES = \ libglade.c pkginclude_HEADERS = pygtk.h +pkgincludedir = $(includedir)/pygtk-2.0/pygtk # chmod hack here is because automake guys decided distdir should be # read only for the next version :( diff --git a/pygtk-2.0.pc.in b/pygtk-2.0.pc.in index 2cc2c600..b8ed6a56 100644 --- a/pygtk-2.0.pc.in +++ b/pygtk-2.0.pc.in @@ -6,7 +6,7 @@ datadir=@datadir@ # you can use the --variable=pygtkincludedir argument to # pkg-config to get this value. You might want to use this to # install additional headers. -pygtkincludedir=${includedir}/pygtk +pygtkincludedir=${includedir}/pygtk-2.0 # same here. Useful when calling the code generator in addon packages. defsdir=${datadir}/pygtk/2.0/defs diff --git a/pygtk.spec.in b/pygtk.spec.in index fec72ea1..c3ea5278 100644 --- a/pygtk.spec.in +++ b/pygtk.spec.in @@ -3,7 +3,7 @@ Summary: Python bindings for the GTK+ widget set. Name: pygtk2 Version: @VERSION@ -Release: 2 +Release: 3 Copyright: LGPL Group: Development/Languages Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.gz @@ -38,6 +38,9 @@ This package contains files required to build wrappers for GTK+ addon libraries so that they interoperate with pygtk. %changelog +* Mon Oct 15 2001 Matt Wilson <msw@redhat.com> +- get the headers from their new version-specific location + * Thu Oct 11 2001 Matt Wilson <msw@redhat.com> - fixed typo in devel filelist - added macro that tests to see if we have libglade2, make the @@ -80,8 +83,9 @@ make DESTDIR=$RPM_BUILD_ROOT install %defattr(755, root, root, 755) %{_prefix}/bin/pygtk-codegen-2.0 %defattr(644, root, root, 755) -%dir %{_prefix}/include/pygtk -%{_prefix}/include/pygtk/*.h +%dir %{_prefix}/include/pygtk-2.0 +%dir %{_prefix}/include/pygtk-2.0/pygtk +%{_prefix}/include/pygtk-2.0/pygtk/*.h %{_prefix}/lib/pkgconfig/pygtk-2.0.pc %dir %{_prefix}/share/pygtk %dir %{_prefix}/share/pygtk/2.0 |