Removed devel sub-packageHEADmaster

2 files changed, 13 insertions, 32 deletions

diff --git a/postgresql92/meta-postgresql92.spec b/postgresql92/meta-postgresql92.spec
index 893cbc0..01575ac 100644
--- a/postgresql92/meta-postgresql92.spec
+++ b/postgresql92/meta-postgresql92.spec
@@ -11,6 +11,7 @@ Group: Applications/File
 Requires: scl-utils
 Requires: %{scl_prefix}postgresql
 BuildRequires: scl-utils-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 This is the main package for %scl Software Collection.
diff --git a/postgresql92/postgresql.spec b/postgresql92/postgresql.spec
index ad96da7..0303574 100644
--- a/postgresql92/postgresql.spec
+++ b/postgresql92/postgresql.spec
@@ -224,20 +224,6 @@ The postgresql-contrib package contains various extension modules that are
 included in the PostgreSQL distribution.
 
 
-%package devel
-Summary: PostgreSQL development header files and libraries
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description devel
-The postgresql-devel package contains the header files and libraries
-needed to compile C or C++ applications which will directly interact
-with a PostgreSQL database management server.  It also contains the ecpg
-Embedded C Postgres preprocessor. You need to install this package if you want
-to develop applications which will interact with a PostgreSQL server.
-
-
 %if %upgrade
 %package upgrade
 Summary: Support for upgrading from the previous major release of PostgreSQL
@@ -306,7 +292,6 @@ Install this if you want to write database functions in Tcl.
 Summary: The test suite distributed with PostgreSQL
 Group: Applications/Databases
 Requires: %{name}-server%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description test
 The postgresql-test package contains files needed for various tests for the
@@ -706,10 +691,6 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{?_scl_root}/var/lib/pgsql/.bash_prof
 	# Makefiles, however.
 	mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test
 	cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test
-	# pg_regress binary should be only in one subpackage, 
-	# there will be a symlink from -test to -devel
-	rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress
-	ln -sf ../../pgxs/src/test/regress/pg_regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress
 	pushd  $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
 	rm -f GNUmakefile Makefile *.o
 	chmod 0755 pg_regress regress.so
@@ -731,11 +712,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/pg_upgrade_support.so
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pg_upgrade.*
 %endif
 
+# remove files from devel package
+rm -rf $RPM_BUILD_ROOT%{?_scl_root}/usr/include/*
+rm -rf $RPM_BUILD_ROOT%{_bindir}/ecpg
+unlink $RPM_BUILD_ROOT%{_libdir}/libpq.so
+unlink $RPM_BUILD_ROOT%{_libdir}/libecpg.so
+unlink $RPM_BUILD_ROOT%{_libdir}/libecpg_compat.so
+unlink $RPM_BUILD_ROOT%{_libdir}/libpgtypes.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pgsql/pgxs/
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ecpg.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/SPI_*
+
 # initialize file lists
 cp /dev/null main.lst
 cp /dev/null libs.lst
 cp /dev/null server.lst
-cp /dev/null devel.lst
 cp /dev/null plperl.lst
 cp /dev/null pltcl.lst
 cp /dev/null plpython.lst
@@ -743,7 +734,7 @@ cp /dev/null plpython3.lst
 
 %if %nls
 %find_lang ecpg-%{majorversion}
-cat ecpg-%{majorversion}.lang >>devel.lst
+cat ecpg-%{majorversion}.lang >>libs.lst
 %find_lang ecpglib6-%{majorversion}
 cat ecpglib6-%{majorversion}.lang >>libs.lst
 %find_lang initdb-%{majorversion}
@@ -1042,17 +1033,6 @@ fi
 %dir %{?_scl_root}/var/run
 %dir %{?_scl_root}/var/lock/subsys
 
-%files devel -f devel.lst
-%{?_scl_root}/usr/include/*
-%{_bindir}/ecpg
-%{_libdir}/libpq.so
-%{_libdir}/libecpg.so
-%{_libdir}/libecpg_compat.so
-%{_libdir}/libpgtypes.so
-%{_libdir}/pgsql/pgxs/
-%{_mandir}/man1/ecpg.*
-%{_mandir}/man3/SPI_*
-
 %if %upgrade
 %files upgrade
 %{_bindir}/pg_upgrade