Changeset: 6abda8507eb5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6abda8507eb5
Modified Files:
buildtools/conf/MonetDB-release-1.0/MonetDB-GPG-KEY
buildtools/conf/MonetDB-release-1.0/monetdb.repo
sql/src/server/rel_select.mx
Branch: default
Log Message:
merge
diffs (233 lines):
diff -r 61c37c0d76f8 -r 6abda8507eb5 buildtools/conf/Makefile.am
--- a/buildtools/conf/Makefile.am Mon Jun 21 23:35:09 2010 +0200
+++ b/buildtools/conf/Makefile.am Mon Jun 21 23:35:48 2010 +0200
@@ -20,10 +20,10 @@
dist_pkgdata_DATA = rules.mk MonetDB.m4
dist_bin_SCRIPTS = Mdebootstrap Mbootstrap buildtools-config Maddlog
-MonetDB-release-1.0.tar.gz: MonetDB-release.spec
MonetDB-release-1.0/monetdb.repo MonetDB-release-1.0/MonetDB-GPG-KEY
- tar czf MonetDB-release-1.0.tar.gz -C $(srcdir) MonetDB-release.spec
MonetDB-release-1.0/monetdb.repo MonetDB-release-1.0/MonetDB-GPG-KEY
+MonetDB-release-1.1.tar.gz: MonetDB-release.spec
MonetDB-release-1.1/monetdb.repo MonetDB-release-1.1/MonetDB-GPG-KEY
+ tar czf MonetDB-release-1.1.tar.gz -C $(srcdir) MonetDB-release.spec
MonetDB-release-1.1/monetdb.repo MonetDB-release-1.1/MonetDB-GPG-KEY
-srpm: MonetDB-release-1.0.tar.gz
+srpm: MonetDB-release-1.1.tar.gz
mkdir -p rpmbuild/BUILD
mkdir -p rpmbuild/BUILDROOT
mkdir -p rpmbuild/RPMS
@@ -31,11 +31,11 @@
mkdir -p rpmbuild/SPECS
mkdir -p rpmbuild/SRPMS
mkdir -p rpmbuild/tmp
- rpmbuild --macros "`rpmbuild --showrc | sed -n 's/macrofiles *:
*//p'`:$(srcdir)/.rpmmacros" -ts MonetDB-release-1.0.tar.gz
+ rpmbuild --macros "`rpmbuild --showrc | sed -n 's/macrofiles *:
*//p'`:$(srcdir)/.rpmmacros" -ts MonetDB-release-1.1.tar.gz
mv rpmbuild/SRPMS/*.src.rpm .
rpm --addsign --define='_signature gpg' --define='_gpg_name 0x0583366F'
*.src.rpm
-rpm: MonetDB-release-1.0.tar.gz
+rpm: MonetDB-release-1.1.tar.gz
mkdir -p rpmbuild/BUILD
mkdir -p rpmbuild/BUILDROOT
mkdir -p rpmbuild/RPMS
@@ -43,6 +43,6 @@
mkdir -p rpmbuild/SPECS
mkdir -p rpmbuild/SRPMS
mkdir -p rpmbuild/tmp
- rpmbuild --macros "`rpmbuild --showrc | sed -n 's/macrofiles *:
*//p'`:$(srcdir)/.rpmmacros" -tb MonetDB-release-1.0.tar.gz
+ rpmbuild --macros "`rpmbuild --showrc | sed -n 's/macrofiles *:
*//p'`:$(srcdir)/.rpmmacros" -tb MonetDB-release-1.1.tar.gz
mv rpmbuild/RPMS/noarch/*.noarch.rpm .
rpm --addsign --define='_signature gpg' --define='_gpg_name 0x0583366F'
*.noarch.rpm
diff -r 61c37c0d76f8 -r 6abda8507eb5
buildtools/conf/MonetDB-release-1.0/MonetDB-GPG-KEY
--- a/buildtools/conf/MonetDB-release-1.0/MonetDB-GPG-KEY Mon Jun 21
23:35:09 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEkdQv4RBACKgNyXB2r5mEEN4whHh53sPa4LnWUUi23uKVt/x1kH3tKDVoNt
-zmWtJKp/O76EUIsAVpURCHv2jIvOmGf49XZL3S2kL4Q2UemP+6RAmBV2EQ+OZqRo
-O5IlO05+T9KMEP1aky3uUzxJOAjSoPMaSOdcFa6aCY43VUO8+RQIxaju2wCghQjz
-hO7uKmdMcZHr2uy2FXg1F98D/iRmqEwTPZS9ArTSKkxCYYxVm0x3dYtObTtD09r3
-IeTdST7CeFRe6wmS1eCJ7egn9mocMaBz2sxIPzY8UWCi3EAEJ9xAOWnHAzMsipEC
-Qi1eNUk4wAEJ96rVQiPuHeHRIoScpMXVJ95dQkVZ4yqnSOmvxoCwgyjy05eObtE8
-qF7yA/9C+m3Mz23Vi0UAoo1s+EZ5Yl64G0Mes998ms7w1rMXLTTGikw2SoQpj2v9
-Xe7iEY7BuJXDiR4Mc+yufeE+Y89fGX5F+3r+c198yU5YECxD2AY5KAYW/o5emURl
-9E+Dc2WDDJ/u3ykolyauZx4u6X/0TIWSHeH064PkidatuTGiJLQvTW9uZXREQiBE
-YXRhYmFzZSBTeXN0ZW0gUGFja2FnZXIgPG1vbmV0QGN3aS5ubD6IYAQTEQIAIAUC
-SR1C/gIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEAU8PtQFgzZv3xgAn2s4
-HY9oMdrKVVchi331wWBtn9BsAJ4lEsEyMoGLGvfmaxBvJiH5X95LIYicBBABAgAG
-BQJJHXC2AAoJED7g04AjvIQpuRAD/2FQJ22VWTPGwcJ+kb51rNGiAZvbae8iAiYW
-WhvuC/++kWKMhw5qFUJt9i+kVZLD8v4zBrd7hprK19vBQmRE4XJEV0nZoZKkarNF
-5jhnsV+XbkRyGGmFs7kTAJeEIUI9mvFkvuiRyaWtffDFDH9o7aI8w0YirFXtxjza
-1jmbQZMCuQINBEkdQv4QCACS1VFigrsea+uJKjObNzaUH7sp5i6O5/S+NsV1VGOn
-J+S5f87aTxjqsqDhkM1Ub5S8IP99G+k8Knv05ZW14jCUZttRIEXOQI4vc/HEeUpa
-cVLqEr4Ih1+9kboCqV6w2i/RR+joPaTgs3z3+d5vfh2QH3ZLvtJoDpp0OvwtAMMA
-R9jHNMa8gSaKm2O2SuIkhlbHvtwv9Ke/VXkntNLKKoVihbj2wcS9AWmwk/9peNY+
-iqyEpEqkfvb5XuxV29ThdrKVJ6wrPgFoG9NAlMzBuq23s+muv1T4s77ZTP2vmo+t
-F1yjwFAH+kHCLfcjIR46qTzGN8SgONy0MU1v0GV6htiPAAQNCACR44prvQOFXl7I
-JGCjbhreTOsgxORDLFi2IAn55wvDgAXHhJiqsiPg3d8vJ9fomtCh2ROoSfPjM0C5
-ZAqvpc2cMuQhTWsyIIqR5wJkufPxcRMGzv5yJeCF09ud3FNNJC+ouW++Y+38O3js
-ZS6UKQcTY+t2Rd9MFepPhOPe1eOTdBMRZSD6TDEeRcmbZZMIWdBQ48rqvRe6Voa8
-GI9H+oKlj43OTObPD9CEAPVlsdHn7HAZ6ZsTHvIntKO2mxyVdIl+o1VaWiTh57Zi
-NCBEHPImx47RRE+sy/wObjCa3YGIdbyZRHT+Yg917iUFcyc6X1M1fMaeKQdI8Zk3
-2ZbOD1UfiEkEGBECAAkFAkkdQv4CGwwACgkQBTw+1AWDNm+A+gCeK/Peb3uZXbYn
-qH/BpBN4KxaTRmUAn0mzrtiKxA+ow9ysAojc4nxcfcVA
-=mmNI
------END PGP PUBLIC KEY BLOCK-----
diff -r 61c37c0d76f8 -r 6abda8507eb5
buildtools/conf/MonetDB-release-1.0/monetdb.repo
--- a/buildtools/conf/MonetDB-release-1.0/monetdb.repo Mon Jun 21 23:35:09
2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-[monetdb]
-name=MonetDB $releasever - $basearch
-baseurl=http://monetdb.cwi.nl/downloads/Fedora/$releasever/$basearch/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-
-[monetdb-debuginfo]
-name=MonetDB Debug $releasever - $basearch
-baseurl=http://monetdb.cwi.nl/downloads/Fedora/debug/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-
-[monetdb-source]
-name=MonetDB Source $releasever - $basearch
-baseurl=http://monetdb.cwi.nl/downloads/Fedora/source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-
-[monetdb-testing]
-name=MonetDB Testing $releasever - $basearch
-baseurl=http://monetdb.cwi.nl/downloads/testing/Fedora/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-
-[monetdb-testing-debuginfo]
-name=MonetDB Testing Debug $releasever - $basearch
-baseurl=http://monetdb.cwi.nl/downloads/testing/Fedora/debug/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-
-[monetdb-testing-source]
-name=MonetDB Testing Source $releasever - $basearch
-baseurl=http://monetdb.cwi.nl/downloads/testing/Fedora/source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
diff -r 61c37c0d76f8 -r 6abda8507eb5
buildtools/conf/MonetDB-release-1.1/MonetDB-GPG-KEY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/buildtools/conf/MonetDB-release-1.1/MonetDB-GPG-KEY Mon Jun 21
23:35:48 2010 +0200
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+mQGiBEkdQv4RBACKgNyXB2r5mEEN4whHh53sPa4LnWUUi23uKVt/x1kH3tKDVoNt
+zmWtJKp/O76EUIsAVpURCHv2jIvOmGf49XZL3S2kL4Q2UemP+6RAmBV2EQ+OZqRo
+O5IlO05+T9KMEP1aky3uUzxJOAjSoPMaSOdcFa6aCY43VUO8+RQIxaju2wCghQjz
+hO7uKmdMcZHr2uy2FXg1F98D/iRmqEwTPZS9ArTSKkxCYYxVm0x3dYtObTtD09r3
+IeTdST7CeFRe6wmS1eCJ7egn9mocMaBz2sxIPzY8UWCi3EAEJ9xAOWnHAzMsipEC
+Qi1eNUk4wAEJ96rVQiPuHeHRIoScpMXVJ95dQkVZ4yqnSOmvxoCwgyjy05eObtE8
+qF7yA/9C+m3Mz23Vi0UAoo1s+EZ5Yl64G0Mes998ms7w1rMXLTTGikw2SoQpj2v9
+Xe7iEY7BuJXDiR4Mc+yufeE+Y89fGX5F+3r+c198yU5YECxD2AY5KAYW/o5emURl
+9E+Dc2WDDJ/u3ykolyauZx4u6X/0TIWSHeH064PkidatuTGiJLQvTW9uZXREQiBE
+YXRhYmFzZSBTeXN0ZW0gUGFja2FnZXIgPG1vbmV0QGN3aS5ubD6IYAQTEQIAIAUC
+SR1C/gIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEAU8PtQFgzZv3xgAn2s4
+HY9oMdrKVVchi331wWBtn9BsAJ4lEsEyMoGLGvfmaxBvJiH5X95LIYicBBABAgAG
+BQJJHXC2AAoJED7g04AjvIQpuRAD/2FQJ22VWTPGwcJ+kb51rNGiAZvbae8iAiYW
+WhvuC/++kWKMhw5qFUJt9i+kVZLD8v4zBrd7hprK19vBQmRE4XJEV0nZoZKkarNF
+5jhnsV+XbkRyGGmFs7kTAJeEIUI9mvFkvuiRyaWtffDFDH9o7aI8w0YirFXtxjza
+1jmbQZMCuQINBEkdQv4QCACS1VFigrsea+uJKjObNzaUH7sp5i6O5/S+NsV1VGOn
+J+S5f87aTxjqsqDhkM1Ub5S8IP99G+k8Knv05ZW14jCUZttRIEXOQI4vc/HEeUpa
+cVLqEr4Ih1+9kboCqV6w2i/RR+joPaTgs3z3+d5vfh2QH3ZLvtJoDpp0OvwtAMMA
+R9jHNMa8gSaKm2O2SuIkhlbHvtwv9Ke/VXkntNLKKoVihbj2wcS9AWmwk/9peNY+
+iqyEpEqkfvb5XuxV29ThdrKVJ6wrPgFoG9NAlMzBuq23s+muv1T4s77ZTP2vmo+t
+F1yjwFAH+kHCLfcjIR46qTzGN8SgONy0MU1v0GV6htiPAAQNCACR44prvQOFXl7I
+JGCjbhreTOsgxORDLFi2IAn55wvDgAXHhJiqsiPg3d8vJ9fomtCh2ROoSfPjM0C5
+ZAqvpc2cMuQhTWsyIIqR5wJkufPxcRMGzv5yJeCF09ud3FNNJC+ouW++Y+38O3js
+ZS6UKQcTY+t2Rd9MFepPhOPe1eOTdBMRZSD6TDEeRcmbZZMIWdBQ48rqvRe6Voa8
+GI9H+oKlj43OTObPD9CEAPVlsdHn7HAZ6ZsTHvIntKO2mxyVdIl+o1VaWiTh57Zi
+NCBEHPImx47RRE+sy/wObjCa3YGIdbyZRHT+Yg917iUFcyc6X1M1fMaeKQdI8Zk3
+2ZbOD1UfiEkEGBECAAkFAkkdQv4CGwwACgkQBTw+1AWDNm+A+gCeK/Peb3uZXbYn
+qH/BpBN4KxaTRmUAn0mzrtiKxA+ow9ysAojc4nxcfcVA
+=mmNI
+-----END PGP PUBLIC KEY BLOCK-----
diff -r 61c37c0d76f8 -r 6abda8507eb5
buildtools/conf/MonetDB-release-1.1/monetdb.repo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/buildtools/conf/MonetDB-release-1.1/monetdb.repo Mon Jun 21 23:35:48
2010 +0200
@@ -0,0 +1,41 @@
+[monetdb]
+name=MonetDB $releasever - $basearch
+baseurl=http://dev.monetdb.org/downloads/Fedora/$releasever/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[monetdb-debuginfo]
+name=MonetDB Debug $releasever - $basearch
+baseurl=http://dev.monetdb.org/downloads/Fedora/debug/$releasever/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[monetdb-source]
+name=MonetDB Source $releasever - $basearch
+baseurl=http://dev.monetdb.org/downloads/Fedora/source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[monetdb-testing]
+name=MonetDB Testing $releasever - $basearch
+baseurl=http://dev.monetdb.org/downloads/testing/Fedora/$releasever/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[monetdb-testing-debuginfo]
+name=MonetDB Testing Debug $releasever - $basearch
+baseurl=http://dev.monetdb.org/downloads/testing/Fedora/debug/$releasever/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[monetdb-testing-source]
+name=MonetDB Testing Source $releasever - $basearch
+baseurl=http://dev.monetdb.org/downloads/testing/Fedora/source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
diff -r 61c37c0d76f8 -r 6abda8507eb5 buildtools/conf/MonetDB-release.spec
--- a/buildtools/conf/MonetDB-release.spec Mon Jun 21 23:35:09 2010 +0200
+++ b/buildtools/conf/MonetDB-release.spec Mon Jun 21 23:35:48 2010 +0200
@@ -1,12 +1,12 @@
Name: MonetDB-release
-Version: 1.0
-Release: 4%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: MonetDB YUM Repository
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-URL: http://monetdb.cwi.nl/
-Source0:
http://monetdb.cwi.nl/downloads/sources/%{name}-%{version}.tar.gz
+URL: http://dev.monetdb.org/downloads/
+Source0:
http://dev.monetdb.org/downloads/sources/%{name}-%{version}.tar.gz
BuildArch: noarch
Vendor: MonetDB BV <[email protected]>
@@ -49,6 +49,9 @@
%changelog
+* Mon Jun 21 2010 Sjoerd Mullender <[email protected]> - 1.1-1
+- Moved the repository to dev.monetdb.org.
+
* Mon May 31 2010 Sjoerd Mullender <[email protected]> - 1.0-4
- Updated Vendor information.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
