added gnome-common.spec.in to EXTRA_DISTS added gnome-common.spec.in

	* Makefile.am: added gnome-common.spec.in to EXTRA_DISTS
	* configure.in: added gnome-common.spec.in
	* gnome-common.spec: removed from repository as it appeared
                             generic
	* gnome-common.spec.in: new spec file using Martin's suggestions

svn path=/trunk/; revision=1653

5 files changed, 126 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index d05d9c3..0e01865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-26  Robin * Slomkowski  <rslomkow@eazel.com>
+
+	* Makefile.am: added gnome-common.spec.in to EXTRA_DISTS
+	* configure.in: added gnome-common.spec.in
+	* gnome-common.spec: removed from repository as it appeared
+                             generic
+	* gnome-common.spec.in: new spec file using Martin's suggestions
+
 2000-12-01  Martin Baulig  <baulig@suse.de>
 
 	Released gnome-common 1.2.1.
diff --git a/Makefile.am b/Makefile.am
index 062e33e..6b38943 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ endif
 
 SUBDIRS = bin macros macros2 doc $(support)
 
-EXTRA_DIST = gnome-common.spec gnome-common-2.0.pc.in gnome-common.pc.in
+EXTRA_DIST = gnome-common.spec gnome-common-2.0.pc.in gnome-common.pc.in 
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_file) gnome-common.pc
diff --git a/configure.in b/configure.in
index a386349..5e78c7e 100644
--- a/configure.in
+++ b/configure.in
@@ -46,6 +46,7 @@ AC_OUTPUT([
 gnome-common.pc
 gnome-common-2.0.pc
 Makefile
+gnome-common.spec
 macros/Makefile
 macros2/Makefile
 bin/Makefile
diff --git a/gnome-common.spec b/gnome-common.spec
deleted file mode 100644
index b4bd5ae..0000000
--- a/gnome-common.spec
+++ /dev/null
@@ -1,64 +0,0 @@
-# Note that this is NOT a relocatable package
-%define ver      0.99.5
-%define rel      SNAP
-%define prefix   /usr
-
-Summary: Gnome Common
-Name: gnome-common
-Version: %ver
-Release: %rel
-Copyright: LGPL
-Group: X11/Libraries
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-common/gnome-common-%{ver}.tar.gz
-BuildRoot: /tmp/gnome-common-root
-URL: http://www.gnome.org
-Docdir: %{prefix}/doc
-
-%description
-This is required for every GNOME Application that is not in the
-GNOME CVS Tree.
-
-%package devel
-Summary: Required files for GNOME Applications outside CVS
-Group: X11/libraries
-
-%description devel
-This is required for every GNOME Application that is not in the
-GNOME CVS Tree.
-
-%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
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-, root, root)
-
-%doc AUTHORS COPYING ChangeLog NEWS README
-
-%files devel
-%defattr(-, root, root)
-
-%{prefix}/share/aclocal/gnome/*
-
diff --git a/gnome-common.spec.in b/gnome-common.spec.in
new file mode 100644
index 0000000..3bb7978
--- /dev/null
+++ b/gnome-common.spec.in
@@ -0,0 +1,116 @@
+# Note this is NOT a relocatable thing :)
+%define name		gnome-common
+%define ver		@VERSION@
+%define RELEASE		0_cvs_0
+%define rel		%{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define prefix		/usr
+%define sysconfdir	/etc
+
+Name:		%name
+Summary:	gnome-common contains usefull things common to building gnome packages
+Version: 	%ver
+Distribution:	GNOME
+Vendor:		CVS
+Release: 	%rel
+Copyright: 	GPL
+Group:		Development/Tools
+Source: 	%{name}-%{ver}.tar.gz
+URL: 		http://gnome.org
+BuildRoot:	/var/tmp/%{name}-%{ver}-root
+Docdir: 	%{prefix}/doc
+
+%description
+gnome-common is for developing various GNOME modules that have to do similar things
+
+%package devel
+Summary:	Libraries and include files for developing gnome-common based tools
+Group:		Development/Libraries
+Requires:	%name = %{PACKAGE_VERSION}
+Obsoletes:	%{name}-devel
+
+%package support
+Summary:	gnome-common support applications
+Group:		Development/Tools
+Requires:	%name = %{PACKAGE_VERSION}
+Obsoletes:	%{name}-devel
+
+%description devel
+This package provides the necessary development libraries and include
+files to allow you to develop components that make use of gnome-common source
+
+%description support
+These are supporting applications for using gnome-common
+
+%changelog
+* Mon Mar 26 2000 Robin * Slomkowski <rslomkow@rslomkow.org>
+- created this thing, and replaced the generic specfile
+
+%prep
+%setup
+
+%build
+%ifarch alpha
+  MYARCH_FLAGS="--host=alpha-redhat-linux"
+%endif
+
+LC_ALL=""
+LINGUAS=""
+LANG=""
+export LC_ALL LINGUAS LANG
+
+CFLAGS="$RPM_OPT_FLAGS" ./configure $MYARCH_FLAGS \
+	--prefix=%{prefix} \
+	--enable-platform-gnome-2 \
+	--sysconfdir=%{sysconfdir}
+
+if [ "$SMP" != "" ]; then
+  (make "MAKE=make -k -j $SMP"; exit 0)
+  make
+else
+  make
+fi
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} install
+
+for FILE in "$RPM_BUILD_ROOT/bin/*"; do
+	file "$FILE" | grep -q not\ stripped && strip $FILE
+done
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%post
+if ! grep %{prefix}/lib /etc/ld.so.conf > /dev/null ; then
+  echo "%{prefix}/lib" >> /etc/ld.so.conf
+fi
+  
+/sbin/ldconfig
+  
+%postun -p /sbin/ldconfig
+
+%files
+
+%defattr(0555, bin, bin)
+%{prefix}/bin/*
+
+%defattr (0444, bin, bin)
+%{prefix}/lib/pkgconfig/*common*.pc
+%{prefix}/share/aclocal/gnome-macros/*.m4
+%{prefix}/share/aclocal/gnome2-macros/*.m4
+
+%files devel
+
+%defattr(0555, bin, bin)
+%{prefix}/lib/*support*a
+
+%files support
+
+%defattr(0444, bin, bin)
+%{prefix}/include/gnome/*/*support*.h
+%{prefix}/lib/pkgconfig/*support*.pc
+
+%defattr(0555, bin, bin)
+%{prefix}/lib/*support*.so*