[pig] update to 0.13.0
Peter MacKinnon
pmackinn at fedoraproject.org
Mon Jul 7 18:51:20 UTC 2014
commit a21d672066075b5ab375cab5b824955f4f565ec5
Author: Peter MacKinnon <pmackinn at redhat.com>
Date: Mon Jul 7 18:51:07 2014 +0000
update to 0.13.0
.gitignore | 1 +
...ency-modifications-and-removal-for-hadoop.patch | 187 --------------------
pig.spec | 43 ++++-
sources | 2 +-
4 files changed, 37 insertions(+), 196 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80813ca..aa87307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pig-0.12.0-src.tar.gz
+/pig-3fb18995933a9c992a962e99d87037821e9a3ed4.tar.gz
diff --git a/pig.spec b/pig.spec
index e8654ee..9ca8a2d 100644
--- a/pig.spec
+++ b/pig.spec
@@ -1,3 +1,6 @@
+%global commit 3fb18995933a9c992a962e99d87037821e9a3ed4
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
%global hadoop_version 23
%global hbase_version 95
%global javacc_version SYSTEM
@@ -6,16 +9,14 @@
%global netty_version 3
Name: pig
-Version: 0.12.0
-Release: 5%{?dist}
+Version: 0.13.0
+Release: 1%{?dist}
Summary: Apache Pig
License: ASL 2.0
URL: http://pig.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{name}-%{version}/%{name}-%{version}-src.tar.gz
+Source0: https://github.com/apache/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
Source1: pig-env.sh
-# numerous multi-line dependency mods
-Patch0: pig-ivy-dependency-modifications-and-removal-for-hadoop.patch
BuildRequires: apache-ivy >= 2.3.0
BuildRequires: automaton
@@ -65,12 +66,31 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
-%setup -q -n %{name}-%{version}-src
+%setup -q -n %{name}-%{commit}
find -name '*.jar' -delete
sed -i 's/\r//' LICENSE.txt NOTICE.txt README.txt
-%patch0 -p1
+# ivy dep changes
+sed -i 's/groovy-all/groovy/' ivy.xml
+sed -i '/jruby-complete/a <dependency org="org.jruby.extras" name="bytelist" rev="${jruby.version}" conf="compile->master"/>' ivy.xml
+sed -i 's/jruby-complete/jruby/' ivy.xml
+
+sed -i 's/org="hsqldb"/org="org.hsqldb"/' ivy.xml
+sed -i '/parquet-pig-bundle/d' ivy.xml
+
+# crude multi-line deletions
+sed -i '/jersey-bundle/,+1d' ivy.xml
+sed -i '/org.mortbay.jetty/,+1d' ivy.xml
+sed -i '/accumulo-core/,+14d' ivy.xml
+sed -i '/accumulo-minicluster/,+14d' ivy.xml
+sed -i '/org.vafer/,+2d' ivy.xml
+
+# remove/fix test deps
+sed -i '/avro-tools/,+1d' ivy.xml
+sed -i '/jopt-simple/,+1d' ivy.xml
+sed -i '/hive-exec/,+1d' ivy.xml
+sed -i 's/com.yammer.metrics/com.codahale.metrics/' ivy.xml
# harmless missing ant exec but we'll take it out
sed -i "/<svnversion/d" build.xml
@@ -80,6 +100,10 @@ sed -i "/<svnversion/d" build.xml
rm src/org/apache/pig/builtin/ParquetLoader.java
rm src/org/apache/pig/builtin/ParquetStorer.java
+# remove accumulo src files
+#TODO: revisit if accumulo comes in
+rm src/org/apache/pig/backend/hadoop/accumulo/*.java
+
# change jython imports to their guava equivalents
sed -i "/org.python.google.common.collect.Maps/d" src/org/apache/pig/builtin/InvokerGenerator.java
sed -i "s/org.python.google/com.google/" src/org/apache/pig/newplan/logical/expression/UserFuncExpression.java
@@ -149,7 +173,7 @@ cp -r build/docs %{buildroot}%{_javadocdir}/%{name}
%files -f .mfiles
%doc LICENSE.txt NOTICE.txt README.txt
-%{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}
%{_bindir}/%{name}
%{_datadir}/%{name}
@@ -158,6 +182,9 @@ cp -r build/docs %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Mon Jul 07 2014 Peter MacKinnon <pmackinn at redhat.com> 0.13.0-1
+- update to 0.13.0
+
* Fri Jun 20 2014 Peter MacKinnon <pmackinn at redhat.com> 0.12.0-5
- enable jython support
- add jline1 BR
diff --git a/sources b/sources
index 40ed580..3160613 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2282fa3f21bb52a9ac1ad360fe807892 pig-0.12.0-src.tar.gz
+ca9bbfe24eea12edfca205872fb20f50 pig-3fb18995933a9c992a962e99d87037821e9a3ed4.tar.gz
More information about the scm-commits
mailing list