diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f39117c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/kross-interpreters-4.10.5.tar.xz diff --git a/.kross-interpreters.metadata b/.kross-interpreters.metadata new file mode 100644 index 0000000..e7ff547 --- /dev/null +++ b/.kross-interpreters.metadata @@ -0,0 +1 @@ +58bb1c9fb45d20768c59e1147aa954d14d6dd18e SOURCES/kross-interpreters-4.10.5.tar.xz diff --git a/SOURCES/kross-interpreters-logical-expression.patch b/SOURCES/kross-interpreters-logical-expression.patch new file mode 100644 index 0000000..7f88da9 --- /dev/null +++ b/SOURCES/kross-interpreters-logical-expression.patch @@ -0,0 +1,13 @@ +diff --git a/ruby/rubyextension.cpp b/ruby/rubyextension.cpp +index 7630058..e2769f7 100644 +--- a/ruby/rubyextension.cpp ++++ b/ruby/rubyextension.cpp +@@ -268,7 +268,7 @@ VALUE RubyExtension::callConnect(int argc, VALUE *argv, VALUE self) + rb_raise(rb_eTypeError, "First argument needs to be a signalname or a sender-object."); + return Qfalse; + } +- if( ! TYPE(argv[1]) != T_STRING ) { ++ if( TYPE(argv[1]) != T_STRING ) { + rb_raise(rb_eTypeError, "Second argument needs to be a signalname."); + return Qfalse; + } diff --git a/SOURCES/kross-interpreters-ruby2.patch b/SOURCES/kross-interpreters-ruby2.patch new file mode 100644 index 0000000..72c894f --- /dev/null +++ b/SOURCES/kross-interpreters-ruby2.patch @@ -0,0 +1,25 @@ +From: Pino Toscano +Date: Sat, 12 Apr 2014 10:21:47 +0000 +Subject: ruby: do not reject ruby versions greater than 1.9 +X-Git-Tag: v4.12.5 +X-Git-Url: http://quickgit.kde.org/?p=kross-interpreters.git&a=commitdiff&h=7f919486919fb083670f66b5d9054a1c5e2179d0 +--- +ruby: do not reject ruby versions greater than 1.9 + +krossruby seems to build fine with them, so do not require just ruby +1.9.x. +--- + + +--- a/ruby/CMakeLists.txt ++++ b/ruby/CMakeLists.txt +@@ -1,9 +1,6 @@ + find_package(Ruby 1.9 QUIET) + +-if( RUBY_VERSION VERSION_GREATER "1.10" ) +- message(STATUS "Found Ruby: ${RUBY_EXECUTABLE} (found version \"${RUBY_VERSION}\") but only 1.9.x supported") +- set(RUBY_FOUND False) +-else() ++if(RUBY_FOUND) + message(STATUS "Found Ruby: ${RUBY_EXECUTABLE} (found version \"${RUBY_VERSION}\")") + endif() diff --git a/SPECS/kross-interpreters.spec b/SPECS/kross-interpreters.spec new file mode 100644 index 0000000..ba608f0 --- /dev/null +++ b/SPECS/kross-interpreters.spec @@ -0,0 +1,267 @@ + +## falcon (still) not functional +#define kross_falcon 1 +## java needs love +#define kross_java 1 + +%if 0%{?fedora} > 18 || 0%{?rhel} > 6 +%define kross_ruby 1 +%global ruby_release 1 +%else +%if 0%{?fedora} >= 16 && 0%{?fedora} <= 18 || 0%{?rhel} == 6 +%define kross_ruby 1 +%global ruby_abi 1.9.1 +%else +%define kross_ruby 1 +%global ruby_abi 1.8 +%endif +%endif + +Name: kross-interpreters +Version: 4.10.5 +Release: 8%{?dist} +Summary: Kross interpreters + +License: LGPLv2+ +URL: http://developer.kde.org/language-bindings/ +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz +Patch0: kross-interpreters-ruby2.patch +Patch1: kross-interpreters-logical-expression.patch + +BuildRequires: kdelibs4-devel >= %{version} +%if 0%{?kross_falcon} +BuildRequires: Falcon-devel +%endif +%if 0%{?kross_java} +BuildRequires: java-devel +%endif +%if 0%{?kross_ruby} +BuildRequires: ruby-devel ruby +%endif +BuildRequires: python-devel + +%description +%{summary}. + +%package -n kross-python +Summary: Kross plugin for python +Requires: kdelibs4 >= %{version} +Provides: kross(python) = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +%description -n kross-python +Python plugin for the Kross archtecture in KDE. + +%package -n kross-falcon +Summary: Kross plugin for falcon +Requires: Falcon +Requires: kdelibs4 >= %{version} +Provides: kross(falcon) = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +%description -n kross-falcon +Falcon plugin for the Kross archtecture in KDE. + +%package -n kross-java +Summary: Kross plugin for java +Requires: kdelibs4 >= %{version} +Provides: kross(java) = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +%description -n kross-java +Java plugin for the Kross archtecture in KDE. + +%package -n kross-ruby +Summary: Kross plugin for ruby +%{?ruby_abi:Requires: ruby(abi) = %{ruby_abi}} +%{?ruby_release:Requires: ruby(release)} +Requires: kdelibs4 >= %{version} +Provides: kross(ruby) = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +%description -n kross-ruby +Ruby plugin for the Kross architecture in KDE. + + +%prep +%setup -q +%patch0 -p1 -b .ruby2 +%patch1 -p1 -b .logical-expression + +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + + +%install +rm -rf %{buildroot} +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + + +%if ! 0%{?kross_java} +rm -rf %{buildroot}%{_kde4_libdir}/kde4/krossjava.so \ + %{buildroot}%{_kde4_libdir}/kde4/kross/kross.jar +%endif + +%clean +rm -rf %{buildroot} + + +%files +# intentionally left blank (for now) + +%files -n kross-python +%{_kde4_libdir}/kde4/krosspython.so + +%if 0%{?kross_falcon} +%files -n kross-falcon +%{_kde4_libdir}/kde4/krossfalcon.so +%endif + +%if 0%{?kross_java} +%files -n kross-java +%{_kde4_libdir}/kde4/kross/kross.jar +%{_kde4_libdir}/kde4/krossjava.so +%endif + +%if 0%{?kross_ruby} +%files -n kross-ruby +%{_kde4_libdir}/kde4/krossruby.so +%endif + + +%changelog +* Wed Aug 19 2015 Jan Grulich - 4.10.5-8 +- Properly remove kross-java files + Resolves: bz#1253143, build failure when java is installed in build enviroment + +* Wed Aug 19 2015 Jan Grulich - 4.10.5-7 +- Fix installed files for -java subpkg + Resolves: bz#1253143, build failure when java is installed in build enviroment + +* Wed Aug 19 2015 Than Ngo - 4.10.5-6 +- Resolves: bz#1253143, build failure when java is installed in build enviroment + +* Wed Aug 12 2015 Jan Grulich - 4.10.5-5 +- Fix logical expression reported by coverity scan + +* Tue Aug 04 2015 Jan Grulich - 4.10.5-4 +- Enable kross-ruby with ruby-2.0 + Resolves: bz#1133705 + +* Fri Jan 24 2014 Daniel Mach - 4.10.5-3 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 4.10.5-2 +- Mass rebuild 2013-12-27 + +* Sun Jun 30 2013 Than Ngo - 4.10.5-1 +- 4.10.5 + +* Sat Jun 01 2013 Rex Dieter - 4.10.4-1 +- 4.10.4 + +* Mon May 06 2013 Than Ngo - 4.10.3-1 +- 4.10.3 + +* Mon Apr 01 2013 Rex Dieter - 4.10.2-1 +- 4.10.2 + +* Sat Mar 02 2013 Rex Dieter - 4.10.1-1 +- 4.10.1 + +* Fri Feb 01 2013 Rex Dieter - 4.10.0-1 +- 4.10.0 + +* Tue Jan 22 2013 Rex Dieter - 4.9.98-1 +- 4.9.98 + +* Fri Jan 04 2013 Rex Dieter - 4.9.97-1 +- 4.9.97 + +* Thu Dec 20 2012 Rex Dieter - 4.9.95-1 +- 4.9.95 + +* Tue Dec 04 2012 Rex Dieter - 4.9.90-1 +- 4.9.90 + +* Mon Dec 03 2012 Than Ngo - 4.9.4-1 +- 4.9.4 + +* Sat Nov 03 2012 Rex Dieter - 4.9.3-1 +- 4.9.3 + +* Sat Sep 29 2012 Rex Dieter - 4.9.2-1 +- 4.9.2 + +* Wed Sep 05 2012 Rex Dieter - 4.9.1-1 +- 4.9.1 + +* Thu Jul 26 2012 Lukas Tinkl - 4.9.0-1 +- 4.9.0 + +* Thu Jul 19 2012 Fedora Release Engineering - 4.8.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 11 2012 Rex Dieter - 4.8.97-1 +- 4.8.97 + +* Thu Jun 28 2012 Rex Dieter - 4.8.95-1 +- 4.8.95 + +* Sun Jun 10 2012 Rex Dieter - 4.8.90-1 +- 4.8.90 + +* Wed May 23 2012 Than Ngo - 4.8.3-2 +- rhel/fedora condition + +* Mon Apr 30 2012 Jaroslav Reznik - 4.8.3-1 +- 4.8.3 + +* Fri Mar 30 2012 Rex Dieter - 4.8.2-1 +- 4.8.2 + +* Mon Mar 05 2012 Jaroslav Reznik - 4.8.1-1 +- 4.8.1 + +* Sat Feb 11 2012 Rex Dieter 4.8.0-2 +- omit kross-ruby on f17+, ftbfs against ruby (#794742, kde#243565) + +* Sun Jan 22 2012 Rex Dieter - 4.8.0-1 +- 4.8.0 + +* Wed Jan 04 2012 Radek Novacek - 4.7.97-1 +- 4.7.97 + +* Thu Dec 22 2011 Radek Novacek - 4.7.95-1 +- 4.7.95 + +* Sun Dec 04 2011 Rex Dieter - 4.7.90-1 +- 4.7.90 + +* Fri Nov 25 2011 Rex Dieter 4.7.80-1 +- 4.7.80 + +* Sat Oct 29 2011 Rex Dieter 4.7.3-1 +- 4.7.3 + +* Tue Oct 04 2011 Rex Dieter 4.7.2-1 +- 4.7.2 + +* Wed Sep 14 2011 Radek Novacek 4.7.1-1 +- 4.7.1 + +* Tue Jul 26 2011 Jaroslav Reznik 4.7.0-1 +- 4.7.0 + +* Fri Jul 15 2011 Rex Dieter 4.6.95-1 +- 4.6.95 + +* Wed Jul 06 2011 Than Ngo - 4.6.90-1 +- first Fedora RPM