Changeset: ee56e8200d2b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee56e8200d2b
Modified Files:
MonetDB.spec
clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec
clients/ruby/ruby-monetdb-sql-0.1.gemspec
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (80 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -941,37 +941,32 @@ developer, but if you do want to test, t
make
%install
-rm -rf $RPM_BUILD_ROOT
-
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/monetdb5/dbfarm
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/monetdb
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/monetdb
-mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}
-if [ ! $RPM_BUILD_ROOT%{_prefix}/lib/perl5 -ef
$RPM_BUILD_ROOT%{perl_vendorlib} ]; then
- mv $RPM_BUILD_ROOT%{_prefix}/lib/perl5/* $RPM_BUILD_ROOT%{perl_vendorlib}
+%make_install
+
+mkdir -p %{buildroot}%{_localstatedir}/MonetDB
+mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm
+mkdir -p %{buildroot}%{_localstatedir}/log/monetdb
+mkdir -p %{buildroot}%{_localstatedir}/run/monetdb
+mkdir -p %{buildroot}%{perl_vendorlib}
+if [ ! %{buildroot}%{_prefix}/lib/perl5 -ef %{buildroot}%{perl_vendorlib} ];
then
+ mv %{buildroot}%{_prefix}/lib/perl5/* %{buildroot}%{perl_vendorlib}
fi
# remove unwanted stuff
# .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/monetdb5/*.la
# internal development stuff
-rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
+rm -f %{buildroot}%{_bindir}/Maddlog
%if 0%{?fedora} >= 20
-mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL-%{version}
$RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL
+mv %{buildroot}%{_datadir}/doc/MonetDB-SQL-%{version}
%{buildroot}%{_datadir}/doc/MonetDB-SQL
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-rm -fr $RPM_BUILD_ROOT
-
%changelog
* Fri Jan 23 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.9-20150123
- Rebuilt.
diff --git a/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec
b/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec
--- a/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec
+++ b/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec
@@ -4,7 +4,8 @@ Gem::Specification.new do |s|
s.version = "0.1"
s.date = %q{2009-05-18}
s.authors = ["G Modena"]
- s.email = %q{g...@cwi.nl}
+ s.email = "i...@monetdb.org"
+ s.licenses = ["MPL-1.1"]
s.summary = %q{ActiveRecord Connector for MonetDB}
s.homepage = %q{http://www.monetdb.org/}
s.description = %q{ActiveRecord Connector for MonetDB built on top of the
pure Ruby database driver}
diff --git a/clients/ruby/ruby-monetdb-sql-0.1.gemspec
b/clients/ruby/ruby-monetdb-sql-0.1.gemspec
--- a/clients/ruby/ruby-monetdb-sql-0.1.gemspec
+++ b/clients/ruby/ruby-monetdb-sql-0.1.gemspec
@@ -5,7 +5,8 @@ Gem::Specification.new do |s|
s.version = "0.1"
s.date = %q{2009-04-27}
s.authors = ["G Modena"]
- s.email = %q{g...@cwi.nl}
+ s.email = "i...@monetdb.org"
+ s.license = "MPL-1.1"
s.summary = %q{Pure Ruby database driver for MonetDB/SQL}
s.homepage = %q{http://www.monetdb.org/}
s.description = %q{Pure Ruby database driver for the MonetDB/SQL columnar
database management system}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
