Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17975
Modified Files:
MonetDB-server.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-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- MonetDB-server.spec.in 31 Aug 2007 15:55:45 -0000 1.23
+++ MonetDB-server.spec.in 5 Sep 2007 17:06:16 -0000 1.24
@@ -1,3 +1,7 @@
+%define name MonetDB5-server
+%define version @VERSION@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
+
# groups of related archs
%define all_x86 i386 i586 i686
@@ -7,27 +11,29 @@
%define bits 64
%endif
-%define name MonetDB5-server
-%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: MonetDB5-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-root
-Packager: Niels Nes <[EMAIL PROTECTED]>
+
+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/MonetDB5-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires(pre): shadow-utils
+# Requires(post): chkconfig
BuildRequires: python
+BuildRequires: pcre-devel
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
-%{!?buildsystem: %define buildsystem 0}
+
%define builddoc 0
Requires: MonetDB-client >= 1.19
@@ -44,12 +50,10 @@
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
%endif
-PreReq: /sbin/chkconfig, /sbin/service, sh-utils
-PreReq: %{_sbindir}/groupadd, %{_sbindir}/useradd
%package devel
Summary: MonetDB development package
-Group: System
+Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
Requires: MonetDB-devel
Requires: MonetDB-client-devel
@@ -60,7 +64,10 @@
automatic index management, extensibility of data types and search
accellerators, SQL- and XML- frontends.
-This package contains the MonetDB5 server component.
+This package contains the MonetDB5 server component. You need this
+package if you want to work using the MAL language, or if you want to
+use the SQL frontend (in which case you need MonetDB-SQL-server5 as
+well).
%description devel
MonetDB is a database management system that is developed from a
@@ -68,8 +75,7 @@
automatic index management, extensibility of data types and search
accellerators, SQL- and XML- frontends.
-This package contains the files that are needed to develop for and
-with MonetDB5.
+This package contains the files needed to develop with MonetDB5.
%prep
rm -rf $RPM_BUILD_ROOT
@@ -78,75 +84,77 @@
%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}
+ %{?comp_cc:CC="%{comp_cc}"}
make
%install
rm -rf $RPM_BUILD_ROOT
-make install \
- DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{localstatedir}/MonetDB5
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5
# insert example db here!
-find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
-
# cleanup stuff we don't want to install
+find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB5/Tests/*
-# Fixes monet config script
-#perl -p -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{prefix}/bin/monet_config
+%pre
+getent group monetdb >/dev/null || groupadd -r monetdb
+getent passwd monetdb >/dev/null || \
+useradd -r -g monetdb -d %{_localstatedir}/MonetDB -s /sbin/nologin \
+ -c "MonetDB Server" monetdb
+exit 0
+
+%post -p /sbin/ldconfig
+
+#create monetdb init script
+#/sbin/chkconfig --add monetdb
+
+%postun -p /sbin/ldconfig
%clean
rm -fr $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%{prefix}/bin/mserver5
-%{prefix}/bin/Mbeddedmal
-%{prefix}/bin/mcheckpoint
-%{prefix}/bin/merovingian
-%{prefix}/bin/monetdb
-%{prefix}/bin/mrecover
-%{prefix}/bin/stethoscope
+%{_bindir}/mserver5
+%{_bindir}/Mbeddedmal
+%{_bindir}/mcheckpoint
+%{_bindir}/merovingian
+%{_bindir}/monetdb
+%{_bindir}/mrecover
+%{_bindir}/stethoscope
%{_libdir}/*.so.*
+%dir %{_libdir}/MonetDB5
+%dir %{_libdir}/MonetDB5/lib
%{_libdir}/MonetDB5/lib/*.so*
%{_libdir}/MonetDB5/*.mal
-%attr(770,monetdb,monetdb) %dir %{localstatedir}/MonetDB5
+%{_mandir}/man1/monetdb.1.gz
-%config(noreplace) %{sysconfdir}/monetdb5.conf
+%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+
+%config(noreplace) %{_sysconfdir}/monetdb5.conf
%files devel
%defattr(-,root,root)
-%{prefix}/bin/monetdb5-config
-%{prefix}/include/MonetDB5/*.h
-%{prefix}/include/MonetDB5/*/*.[hcm]
+%{_bindir}/monetdb5-config
+%dir %{_includedir}/MonetDB5
+%dir %{_includedir}/MonetDB5/*
+%{_includedir}/MonetDB5/*.h
+%{_includedir}/MonetDB5/*/*.[hcm]
%{_libdir}/*.so
-
-%pre
-%{_sbindir}/groupadd -r monetdb 2>/dev/null || :
-%{_sbindir}/useradd -d %{localstatedir}/MonetDB5 -s /bin/true -g monetdb -M -r
monetdb 2>/dev/null || :
-
-%post
-umask 022
-
-#create monetdb init script
-#/sbin/chkconfig --add monetdb
-
%changelog
* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
- Built.
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/rpm.mk.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rpm.mk.in 23 Aug 2007 12:46:31 -0000 1.8
+++ rpm.mk.in 5 Sep 2007 17:06:16 -0000 1.9
@@ -61,3 +61,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 MonetDB5-* -perm -0111 -type f ! -name \*.bat ! -name \*.sh !
-exec grep -q '^#!' {} \; -print | xargs --no-run-if-empty chmod -x
+ find MonetDB5-* -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
