dist-git conversion

.cvsignore

@@ -1 +0,0 @@
-glib-2.23.3.tar.bz2

.gitignore

@@ -0,0 +1 @@
+glib-2.24.1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: glib2
-# $Id: Makefile,v 1.3 2007/10/15 18:47:38 notting Exp $
-NAME := glib2
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

glib2.spec

@@ -2,15 +2,15 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.23.3
+Version: 2.24.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/glib/2.23/glib-%{version}.tar.bz2
+#VCS: git:git://git.gnome.org/glib
+Source: http://download.gnome.org/sources/glib/2.24/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.14
 BuildRequires: gamin-devel
 BuildRequires: gettext
@@ -23,13 +23,10 @@ BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 
 %description
-GLib is the low-level core library that forms the basis
-for projects such as GTK+ and GNOME. It provides data structure
-handling for C, portability wrappers, and interfaces for such runtime
-functionality as an event loop, threads, dynamic loading, and an
-object system.
-
-This package provides version 2 of GLib.
+GLib is the low-level core library that forms the basis for projects
+such as GTK+ and GNOME. It provides data structure handling for C,
+portability wrappers, and interfaces for such runtime functionality
+as an event loop, threads, dynamic loading, and an object system.
 
 %package devel
 Summary: A library of handy utility functions
@@ -38,8 +35,7 @@ Requires: pkgconfig >= 1:0.14
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-The glib2-devel package includes the header files for
-version 2 of the GLib library.
+The glib2-devel package includes the header files for the GLib library.
 
 # anaconda needs static libs, see RH bug #193143
 %package static
@@ -48,14 +44,17 @@ Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 
 %description static
-The glib2-static package includes static libraries
-of version 2 of the GLib library.
+The glib2-static package includes static libraries of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
 
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
+# remove rpaths
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 # truncate NEWS
@@ -65,7 +64,6 @@ awk '/^Overview of Changes/ { seen+=1 }
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 ## glib2.sh and glib2.csh
@@ -78,7 +76,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
 
-case "$host" in 
+case "$host" in
   alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
     mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-64
     ;;
@@ -142,7 +140,12 @@ esac
 %{_datadir}/glib-2.0
 %exclude %{_datadir}/glib-2.0/gdb/*.pyo
 %exclude %{_datadir}/glib-2.0/gdb/*.pyc
-%{_bindir}/*
+%{_bindir}/glib-genmarshal
+%{_bindir}/glib-gettextize
+%{_bindir}/glib-mkenums
+%{_bindir}/gobject-query
+%{_bindir}/gtester
+%attr (0755, root, root) %{_bindir}/gtester-report
 %doc %{_datadir}/gtk-doc/html/*
 %doc %{_mandir}/man1/*
 %{_datadir}/gdb/auto-load%{libdir}/libglib-2.0.so.*-gdb.py*
@@ -154,8 +157,26 @@ esac
 %{_libdir}/lib*.a
 
 %changelog
+* Sun May  2 2010 Matthias Clasen <mclasen@redhat.com> - 2.24.1-1
+- Update to 2.24.1
+
+* Sun Mar 28 2010 Matthias Clasen <mclasen@redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
+* Mon Mar 22 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.6-1
+- Update to 2.23.6
+
+* Wed Mar 10 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.5-2
+- Fix some rpmlint complaints
+
+* Tue Mar  9 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.5-1
+- Update to 2.23.5
+
+* Sun Feb 21 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.4-1
+- Update to 2.23.4
+
 * Thu Feb 11 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.3-1
-= Update to 2.23.3
+- Update to 2.23.3
 
 * Mon Jan 25 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.2-3
 - Actually apply the patch, too

sources

@@ -1 +1 @@
-c7b0f512892c5459e42b378762eec5b6  glib-2.23.3.tar.bz2
+6a7db81c9a2cffe6a34dadb57d7ba2d2  glib-2.24.1.tar.bz2