Remove gtk+.spec.in from EXTRA_DIST, and from dist rules. (#102231)

Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>

        * Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
        EXTRA_DIST, and from dist rules. (#102231)

diff --git a/ChangeLog b/ChangeLog
index 97fa045666cf5c7c4aa3651e21c3a880e88671d4..6e2ede3fe0ce5b16bbc984e20bec269b5190185c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+       EXTRA_DIST, and from dist rules. (#102231)
+
 2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 97fa045666cf5c7c4aa3651e21c3a880e88671d4..6e2ede3fe0ce5b16bbc984e20bec269b5190185c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+       EXTRA_DIST, and from dist rules. (#102231)
+
 2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 97fa045666cf5c7c4aa3651e21c3a880e88671d4..6e2ede3fe0ce5b16bbc984e20bec269b5190185c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+       EXTRA_DIST, and from dist rules. (#102231)
+
 2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 97fa045666cf5c7c4aa3651e21c3a880e88671d4..6e2ede3fe0ce5b16bbc984e20bec269b5190185c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+       EXTRA_DIST, and from dist rules. (#102231)
+
 2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 97fa045666cf5c7c4aa3651e21c3a880e88671d4..6e2ede3fe0ce5b16bbc984e20bec269b5190185c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Jan 30 16:30:54 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * Makefile.am (EXTRA_DIST): Remove gtk+.spec.in from
+       EXTRA_DIST, and from dist rules. (#102231)
+
 2003-01-30  Daniel Elstner  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (set_child_packing_and_visibility): New helper

diff --git a/Makefile.am b/Makefile.am
index d4f3ef0b420ab596bcd64386f64819ab217b4236..f9654c4cd32eaea207dae9fa194e9dfad330dec1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ AUTOMAKE_OPTIONS = 1.4
 
 EXTRA_DIST =                   \
        HACKING                 \
-       gtk+.spec.in            \
        makecopyright           \
        NEWS.pre-1-0            \
        ChangeLog.pre-1-0       \
@@ -149,14 +148,13 @@ install-data-hook:
         rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
         rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
 
-dist-hook: gtk+.spec
+dist-hook:
        if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
             CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
             CONFIG_HEADERS= \
             $(SHELL) config.status \
             && cp INSTALL README $(distdir) ; \
-       fi \
-       && cp gtk+.spec $(distdir)
+       fi
 
 .PHONY: files release sanity snapshot
 

diff --git a/configure.in b/configure.in
index 6afe33f9008f3d8fdda2f4e35d5236f392a01730..1a16ac96226e6037bca08489f7270a25ac938656 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1577,7 +1577,6 @@ AM_CONDITIONAL(HAVE_SGML2HTML, test x$SGML2HTML != xno)
 AC_OUTPUT([
 config.h.win32
 gtk-zip.sh
-gtk+.spec
 Makefile
 gdk-pixbuf-2.0.pc
 gdk-2.0.pc