dist: move ragel package to /opt/scylladb

Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>

dist/redhat/centos_dep/build_dependency.sh

@@ -91,12 +91,12 @@ if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-ninja-build-1.5.3-2.el7.centos.x86_64.rpm
 fi
 do_install scylla-ninja-build-1.5.3-2.el7.centos.x86_64.rpm
 
-if [ ! -f $RPMBUILD/RPMS/x86_64/ragel-6.8-3.el7.centos.x86_64.rpm ]; then
+if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-ragel-6.8-3.el7.centos.x86_64.rpm ]; then
     rpm --define "_topdir $RPMBUILD" -ivh build/srpms/ragel-6.8-3.fc22.src.rpm
     patch $RPMBUILD/SPECS/ragel.spec < dist/redhat/centos_dep/ragel.diff
     rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/ragel.spec
 fi
-do_install ragel-6.8-3.el7.centos.x86_64.rpm
+do_install scylla-ragel-6.8-3.el7.centos.x86_64.rpm
 
 if [ ! -f $RPMBUILD/RPMS/noarch/antlr3-tool-3.5.2-1.el7.centos.noarch.rpm ]; then
    mkdir build/antlr3-tool-3.5.2

dist/redhat/centos_dep/ragel.diff

@@ -1,14 +1,44 @@
---- rpmbuild/SPECS/ragel.spec	2014-08-18 07:55:49.000000000 -0400
-+++ rpmbuild/SPECS/ragel.spec.1	2015-09-17 22:06:27.623000000 -0400
-@@ -49,8 +49,10 @@
+--- ragel.spec	2014-08-18 11:55:49.000000000 +0000
++++ ragel.spec.1	2015-10-18 12:18:23.000000000 +0000
+@@ -1,17 +1,20 @@
+-Name:           ragel   
++Name:           scylla-ragel   
++%define orig_name ragel
+ Version:        6.8
+ Release:        3%{?dist}
+ Summary:        Finite state machine compiler
  
- %files
- %defattr(-,root,root,-)
--%doc COPYING ragel.vim CREDITS ChangeLog
-+%doc COPYING ragel.vim 
- %doc doc/ragel-guide.pdf
-+%{_docdir}/%{name}/CREDITS 
-+%{_docdir}/%{name}/ChangeLog
- %{_bindir}/ragel
- %{_mandir}/*/*
+ Group:          Development/Tools
+ License:        GPLv2+
+-URL:            http://www.complang.org/%{name}/
+-Source0:        http://www.complang.org/%{name}/%{name}-%{version}.tar.gz
++URL:            http://www.complang.org/%{orig_name}/
++Source0:        http://www.complang.org/%{orig_name}/%{orig_name}-%{version}.tar.gz
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ 
+ # for documentation building
+ BuildRequires:  gcc-objc, autoconf, gcc-c++
++Requires:	scylla-env
+ Requires:       gawk
++%define _prefix /opt/scylladb
+ 
+ %description
+ Ragel compiles finite state machines from regular languages into executable C,
+@@ -21,7 +24,7 @@
+ done using inline operators that do not disrupt the regular language syntax.
+ 
+ %prep
+-%setup -q
++%setup -q -n %{orig_name}-%{version}
+ 
+ # Pass fedora cflags correctly
+ sed -i.flags \
+@@ -34,7 +37,7 @@
+ 
+ %build
+ # set the names of the other programming commandline programs
+-%configure --docdir=%{_docdir}/%{name} RUBY=ruby JAVAC=javac GMCS=gmcs 
++%configure --docdir=%{_docdir}/%{name}-%{version} RUBY=ruby JAVAC=javac GMCS=gmcs 
+ 
+ make %{?_smp_mflags}