Re: [Monetdb-developers] [Monetdb-checkins] clients MonetDB-client.spec.in, 1.1, 1.2 configure.ag, 1.7, 1.8
Niels,
wouldn't also work/be possible to (analogously to sql & pathfinder) have PACKAGE=clients (and hence get clients-VERSION.tar.gz), and replace all 'DIR = pkgXdir' by 'DIR = Xdir/MonetDB' in clients' Makefile.ag and clients/conf/monetdb-clients-config{,.bat}.in ?
Stefan
On Sat, Jan 06, 2007 at 08:57:37PM +0000, Niels Nes wrote:
Update of /cvsroot/monetdb/clients In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27043
Modified Files: MonetDB-client.spec.in configure.ag Log Message: fixes for rpm building
Sofar we used MonetDB-client as tar name. But this gave pkglibdir and pkgdatadir with MonetDB-client as the PACKAGE part. Now we use MonetDB, however this gives a clash with common 'MonetDB' package tar name.
Index: configure.ag
RCS file: /cvsroot/monetdb/clients/configure.ag,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- configure.ag 4 Jan 2007 16:06:37 -0000 1.7 +++ configure.ag 6 Jan 2007 20:57:35 -0000 1.8 @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) -AC_INIT([MonetDB clients], [1.15.0], [monet@cwi.nl], [MonetDB-client]) +AC_INIT([MonetDB clients], [1.15.0], [monet@cwi.nl], [MonetDB]) AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET
Index: MonetDB-client.spec.in
RCS file: /cvsroot/monetdb/clients/MonetDB-client.spec.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MonetDB-client.spec.in 4 Jan 2007 14:24:31 -0000 1.1 +++ MonetDB-client.spec.in 6 Jan 2007 20:57:35 -0000 1.2 @@ -9,7 +9,7 @@ Release: %{release} Summary: MonetDB - Monet Database Management System Group: System -Source: %{name}-%{version}.tar.gz +Source: MonetDB-%{version}.tar.gz BuildRoot: /var/tmp/%{name}-root Packager: Niels Nes Niels.Nes@cwi.nl License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html @@ -117,7 +117,7 @@ %prep rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{name}-%{version} +%setup -q -n MonetDB-%{version}
%build
@@ -144,8 +144,9 @@ find $RPM_BUILD_ROOT -name .incs.in | xargs rm -f
# cleanup stuff we don't want to install -rm -rf $RPM_BUILD_ROOT%{prefix}/share/%{name}/conf/conf.bash -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/Tests/* +rm -rf $RPM_BUILD_ROOT%{_datadir}/MonetDB/conf/conf.bash +rm -rf $RPM_BUILD_ROOT%{_datadir}/MonetDB/Tests/* +rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB/Tests/* rm -rf $RPM_BUILD_ROOT%{prefix}/bin/monetdb-clients-config.bat
rm -rf $RPM_BUILD_ROOT%{prefix}/include/MonetDB/sql.h @@ -197,5 +198,6 @@ %if %{?_with_java:1}%{!?_with_java:0} %files java %defattr(-,monetdb,monetdb) +%{prefix}/bin/mjclient %{prefix}/share/MonetDB/lib/*jar %endif
Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=D... _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
On Sun, Jan 07, 2007 at 11:45:26AM +0100, Stefan Manegold wrote:
Niels,
wouldn't also work/be possible to (analogously to sql & pathfinder) have PACKAGE=clients (and hence get clients-VERSION.tar.gz), and replace all 'DIR = pkgXdir' by 'DIR = Xdir/MonetDB' in clients' Makefile.ag and clients/conf/monetdb-clients-config{,.bat}.in ?
Your right, indeed it would. It just requires fixing all pkg* paths. I'll have a look today.
Niels
Stefan
On Sat, Jan 06, 2007 at 08:57:37PM +0000, Niels Nes wrote:
Update of /cvsroot/monetdb/clients In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27043
Modified Files: MonetDB-client.spec.in configure.ag Log Message: fixes for rpm building
Sofar we used MonetDB-client as tar name. But this gave pkglibdir and pkgdatadir with MonetDB-client as the PACKAGE part. Now we use MonetDB, however this gives a clash with common 'MonetDB' package tar name.
Index: configure.ag
RCS file: /cvsroot/monetdb/clients/configure.ag,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- configure.ag 4 Jan 2007 16:06:37 -0000 1.7 +++ configure.ag 6 Jan 2007 20:57:35 -0000 1.8 @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) -AC_INIT([MonetDB clients], [1.15.0], [monet@cwi.nl], [MonetDB-client]) +AC_INIT([MonetDB clients], [1.15.0], [monet@cwi.nl], [MonetDB]) AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET
Index: MonetDB-client.spec.in
RCS file: /cvsroot/monetdb/clients/MonetDB-client.spec.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MonetDB-client.spec.in 4 Jan 2007 14:24:31 -0000 1.1 +++ MonetDB-client.spec.in 6 Jan 2007 20:57:35 -0000 1.2 @@ -9,7 +9,7 @@ Release: %{release} Summary: MonetDB - Monet Database Management System Group: System -Source: %{name}-%{version}.tar.gz +Source: MonetDB-%{version}.tar.gz BuildRoot: /var/tmp/%{name}-root Packager: Niels Nes Niels.Nes@cwi.nl License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html @@ -117,7 +117,7 @@ %prep rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{name}-%{version} +%setup -q -n MonetDB-%{version}
%build
@@ -144,8 +144,9 @@ find $RPM_BUILD_ROOT -name .incs.in | xargs rm -f
# cleanup stuff we don't want to install -rm -rf $RPM_BUILD_ROOT%{prefix}/share/%{name}/conf/conf.bash -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/Tests/* +rm -rf $RPM_BUILD_ROOT%{_datadir}/MonetDB/conf/conf.bash +rm -rf $RPM_BUILD_ROOT%{_datadir}/MonetDB/Tests/* +rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB/Tests/* rm -rf $RPM_BUILD_ROOT%{prefix}/bin/monetdb-clients-config.bat
rm -rf $RPM_BUILD_ROOT%{prefix}/include/MonetDB/sql.h @@ -197,5 +198,6 @@ %if %{?_with_java:1}%{!?_with_java:0} %files java %defattr(-,monetdb,monetdb) +%{prefix}/bin/mjclient %{prefix}/share/MonetDB/lib/*jar %endif
Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=D... _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |
Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=D... _______________________________________________ Monetdb-developers mailing list Monetdb-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-developers
participants (2)
-
Niels Nes -
Stefan Manegold