Update of /cvsroot/monetdb/MonetDB
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17503
Modified Files:
MonetDB.spec.in rpm.mk.in
Log Message:
Updates to the .spec files to be ever so slightly more compatible with
the Fedora packaging guidelines.
Use %configure instead of ./configure. This implies removing the
--prefix, --bindir, etc. options. This also implies that the compiler
will be called with -D_FORTIFY_SOURCE=2 which makes that the compiler
is even stricter than before. So we do that now as well.
Some fixes to get things compiled with -D_FORTIFY_SOURCE=2. Mostly,
we need to do something with the result of functions such as fwrite,
fread, ftruncate, system.
Added descriptions to all packages.
Created a MonetDB-testing package.
Enabled the MonetDB-SQL-devel package.
When creating the tar balls, remove extraneous execute bits, and don't
include files that are generated by configure (i.e. files for which
there is a corresponding .in file).
Index: MonetDB.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/MonetDB.spec.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- MonetDB.spec.in 31 Aug 2007 15:55:45 -0000 1.56
+++ MonetDB.spec.in 5 Sep 2007 17:05:57 -0000 1.57
@@ -1,3 +1,7 @@
+%define name MonetDB
+%define version @VERSION@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
+
# groups of related archs
%define all_x86 i386 i586 i686
@@ -7,43 +11,63 @@
%define bits 64
%endif
-%define name MonetDB
-%define version @VERSION@
-%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
-
-%define prefix /usr
-%define sysconfdir /etc
-%define localstatedir /var/lib
+# buildsystem is set to 1 when building an rpm from within the build
+# directory; it should be set to 0 (or not set) when building a proper
+# rpm
+%{!?buildsystem: %define buildsystem 0}
Name: %{name}
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Group: System
-Source: %{name}-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-root
-Packager: Niels Nes <[EMAIL PROTECTED]>
-License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-BuildRequires: python
+
+Group: Applications/Databases
+License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+URL: http://monetdb.cwi.nl/
+Source: http://downloads.sourceforge.net/monetdb/%{name}-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: python
BuildRequires: zlib-devel, bzip2-devel, openssl-devel
-%{!?buildsystem: %define buildsystem 0}
+%description
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accellerators, SQL- and XML- frontends.
+
+This package contains the core components of MonetDB. If you want to
+use MonetDB, you will certainly need this package.
%package devel
-Summary: MonetDB development package
-Group: System
+Summary: MonetDB development package
+Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
Requires: python
Requires: zlib-devel, bzip2-devel, openssl-devel
-%description
+%description devel
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automatic index management, extensibility of data types and search
accellerators, SQL- and XML- frontends.
-%description devel
-Add the MonetDB devel description here
+This package contains the files needed to develop with MonetDB.
+
+%package testing
+Summary: MonetDB testing package
+Group: Applications/Databases
+Requires: %{name} = %{version}-%{release}
+
+%description testing
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accellerators, SQL- and XML- frontends.
+
+This package contains the programs and files needed for testing the
+MonetDB packages. You probably don't need this, unless you are a
+developer.
%prep
rm -rf $RPM_BUILD_ROOT
@@ -52,61 +76,66 @@
%build
-./configure \
+%{configure} \
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
- --prefix=%{prefix} \
- --sysconfdir=%{sysconfdir} \
- --localstatedir=%{localstatedir} \
- --libdir=%{_libdir} \
%{?_with_php} %{?_without_php} \
%{?_with_python} %{?_without_python} \
%{?_with_perl} %{?_without_perl} \
- %{?_with_java} %{?_without_java}
+ %{?_with_java} %{?_without_java}
make
%install
rm -rf $RPM_BUILD_ROOT
-make install \
- DESTDIR=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
+make install DESTDIR=$RPM_BUILD_ROOT
-# cleanup stuff we don't want to install
-rm -rf $RPM_BUILD_ROOT%{prefix}/share/%{name}/Mprofile-commands.lst
+# cleanup stuff we don't want to have installed
+find $RPM_BUILD_ROOT -name .incs.in -delete -o -name \*.la -delete
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/Mprofile-commands.lst
-rm -rf $RPM_BUILD_ROOT%{prefix}/bin/M*
-rm -rf $RPM_BUILD_ROOT%{prefix}/bin/prof.py
+%post -p /sbin/ldconfig
-# Fixes monet config script
-#perl -p -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{prefix}/bin/monet_config
+%postun -p /sbin/ldconfig
%clean
rm -fr $RPM_BUILD_ROOT
-%files
-%defattr(-,root,root)
+%files
+%defattr(-,root,root)
%{_libdir}/libmutils.so.*
%{_libdir}/libstream.so.*
%{_libdir}/libbat.so.*
%files devel
-%defattr(-,root,root)
-%{prefix}/bin/monetdb-config
-%{prefix}/share/%{name}/python/*
+%defattr(-,root,root)
+%{_bindir}/monetdb-config
+%{_datadir}/%{name}/python/*
-%{prefix}/include/%{name}/*.h
-%{prefix}/include/%{name}/*/*.[hcm]
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/*
+%{_includedir}/%{name}/*.h
+%{_includedir}/%{name}/*/*.[hcm]
%{_libdir}/libmutils.so
%{_libdir}/libstream.so
%{_libdir}/libbat.so
+%files testing
+%{_bindir}/Mtest.py*
+%{_bindir}/Mapprove.py*
+%{_bindir}/Mprofile.py*
+%{_bindir}/Mdiff
+%{_bindir}/Mfilter.py*
+%{_bindir}/MkillUsers
+%{_bindir}/Mlog
+%{_bindir}/Mtimeout
+%{_bindir}/prof.py*
+
%changelog
-* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
+* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL
PROTECTED]:.oid32}%{!?oid32:.oid%{bits}}
- Built.
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/rpm.mk.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- rpm.mk.in 23 Aug 2007 13:01:23 -0000 1.20
+++ rpm.mk.in 5 Sep 2007 17:05:57 -0000 1.21
@@ -52,3 +52,9 @@
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
+
+cleanup_distr:
+ find MonetDB-* -perm -0111 -type f ! -name \*.bat ! -name \*.sh ! -exec
grep -q '^#!' {} \; -print | xargs --no-run-if-empty chmod -x
+ find MonetDB-* -name \*.in ! -name configure.in ! -name \*.spec.in
-print | while read i; do test -f $${i%.in} && rm -f $${i%.in}; done || true
+
+dist-hook: cleanup_distr
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
