I've made the spec file autogenerated, and I tweaked it

Dr Mike <drmike@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 037d78e..33c4729 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sun Feb 21 14:01:00 1999  Dr Mike <drmike@redhat.com>
+       * Made specfile generated, tweaked slightly
+       
 Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 037d78e..33c4729 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,6 @@
+Sun Feb 21 14:01:00 1999  Dr Mike <drmike@redhat.com>
+       * Made specfile generated, tweaked slightly
+       
 Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 037d78e..33c4729 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,6 @@
+Sun Feb 21 14:01:00 1999  Dr Mike <drmike@redhat.com>
+       * Made specfile generated, tweaked slightly
+       
 Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 037d78e..33c4729 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,6 @@
+Sun Feb 21 14:01:00 1999  Dr Mike <drmike@redhat.com>
+       * Made specfile generated, tweaked slightly
+       
 Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 037d78e..33c4729 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,6 @@
+Sun Feb 21 14:01:00 1999  Dr Mike <drmike@redhat.com>
+       * Made specfile generated, tweaked slightly
+       
 Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 037d78e..33c4729 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,6 @@
+Sun Feb 21 14:01:00 1999  Dr Mike <drmike@redhat.com>
+       * Made specfile generated, tweaked slightly
+       
 Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 037d78e..33c4729 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,6 @@
+Sun Feb 21 14:01:00 1999  Dr Mike <drmike@redhat.com>
+       * Made specfile generated, tweaked slightly
+       
 Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 037d78e..33c4729 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,6 @@
+Sun Feb 21 14:01:00 1999  Dr Mike <drmike@redhat.com>
+       * Made specfile generated, tweaked slightly
+       
 Thu Feb 18 08:24:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_realloc): plugged a memory leak, reported by Koen D'Hondt

diff --git a/Makefile.am b/Makefile.am
index ea00409..faba563 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
 
 EXTRA_DIST = \
        glib.m4                 \
-       glib.spec               \
+       glib.spec.in            \
        acglib.m4               \
        sanity_check            \
        README.win32            \
@@ -97,3 +97,6 @@ sanity:
 
 snapshot:
        $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+
+dist-hook:
+       cp glib.spec $(distdir)
\ No newline at end of file

diff --git a/configure.in b/configure.in
index d9f8fcc..6a6de77 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1244,6 +1244,7 @@ g_mutex_contents="$glib_cv_byte_contents_gmutex"
 ])
 
 AC_OUTPUT([
+glib.spec
 Makefile
 glib-config
 gmodule/gmoduleconf.h

diff --git a/glib.spec b/glib.spec.in
similarity index 65%
rename from glib.spec
rename to glib.spec.in
index 6537ed7..5b67827 100644 (file)
--- a/glib.spec
+++ b/glib.spec.in
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      1.1.16
+%define ver      @VERSION@
 %define rel      SNAP
 %define prefix   /usr
 
@@ -10,8 +10,7 @@ Release: %rel
 Copyright: LGPL
 Group: Libraries
 Source: ftp://ftp.gimp.org/pub/gtk/v1.1/glib-%{ver}.tar.gz
-BuildRoot: /tmp/glib-root
-Packager: Christopher Blizzard <blizzard@redhat.com>
+BuildRoot: /var/tmp/glib-%{PACKAGE_VERSION}-root
 URL: http://www.gtk.org
 Docdir: %{prefix}/doc
 
@@ -31,27 +30,33 @@ useful data structures.
 
 %changelog
 
-* Mon Apr 13 1998 Marc Ewing <marc@redhat.com>
+* Thu Feb 11 1999 Michael Fulbright <drmike@redhat.com>
+- added libgthread to file list
+
+* Fri Feb 05 1999 Michael Fulbright <drmike@redhat.com>
+- version 1.1.15
+
+* Wed Feb 03 1999 Michael Fulbright <drmike@redhat.com>
+- version 1.1.14
+
+* Mon Jan 18 1999 Michael Fulbright <drmike@redhat.com>
+- version 1.1.13
 
+* Wed Jan 06 1999 Michael Fulbright <drmike@redhat.com>
+- version 1.1.12
+
+* Wed Dec 16 1998 Michael Fulbright <drmike@redhat.com>
+- updated in preparation for the GNOME freeze
+
+* Mon Apr 13 1998 Marc Ewing <marc@redhat.com>
 - Split out glib package
 
 %prep
 %setup
 
 %build
-# Needed for snapshot releases.
-if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix
-else
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
-fi
-
-if [ "$SMP" != "" ]; then
-  (make "MAKE=make -k -j $SMP"; exit 0)
-  make
-else
-  make
-fi
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{prefix}/lib/libglib-1.1.so.*
+%{prefix}/lib/libgthread-1.1.so.*
 %{prefix}/lib/libgmodule-1.1.so.*
 
 %files devel
@@ -79,5 +85,6 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/*a
 %{prefix}/lib/glib
 %{prefix}/include/*
+%{prefix}/man/man1/
 %{prefix}/share/aclocal/*
 %{prefix}/bin/*

diff --git a/glib/Makefile.am b/glib/Makefile.am
index ea00409..faba563 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
 
 EXTRA_DIST = \
        glib.m4                 \
-       glib.spec               \
+       glib.spec.in            \
        acglib.m4               \
        sanity_check            \
        README.win32            \
@@ -97,3 +97,6 @@ sanity:
 
 snapshot:
        $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+
+dist-hook:
+       cp glib.spec $(distdir)
\ No newline at end of file