diff --git a/.gitignore b/.gitignore index a89e22b..8d88e41 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /gambas3-3.6.0.tar.bz2 /gambas3-3.6.1.tar.bz2 /gambas3-3.7.1.tar.bz2 +/gambas3-3.8.0.tar.bz2 diff --git a/gambas3.spec b/gambas3.spec index 17efdf6..c8f3e0b 100644 --- a/gambas3.spec +++ b/gambas3.spec @@ -11,8 +11,8 @@ Name: gambas3 Summary: IDE based on a basic interpreter with object extensions -Version: 3.7.1 -Release: 2%{?dist} +Version: 3.8.0 +Release: 1%{?dist} License: GPL+ Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -33,6 +33,7 @@ BuildRequires: SDL_ttf-devel, sqlite2-devel, glew-devel BuildRequires: imlib2-devel, qt-webkit-devel, gsl-devel BuildRequires: libtool, ncurses-devel, gstreamer-plugins-base-devel >= 0.10.31 BuildRequires: gtkglext-devel, gmime-devel, libgnome-keyring-devel +BuildRequires: qt5-qtsvg-devel, qt5-qtbase-devel, qt5-qtx11extras-devel, qt5-qtwebkit-devel %if %{enablejit} BuildRequires: llvm-devel >= 3.3 %endif @@ -117,6 +118,7 @@ Requires: %{name}-gb-desktop-gnome = %{version}-%{release} Requires: %{name}-gb-eval-highlight = %{version}-%{release} Requires: %{name}-gb-form = %{version}-%{release} Requires: %{name}-gb-form-dialog = %{version}-%{release} +Requires: %{name}-gb-form-editor = %{version}-%{release} Requires: %{name}-gb-form-mdi = %{version}-%{release} Requires: %{name}-gb-form-stock = %{version}-%{release} Requires: %{name}-gb-gmp = %{version}-%{release} @@ -164,6 +166,9 @@ Requires: %{name}-gb-qt4 = %{version}-%{release} Requires: %{name}-gb-qt4-ext = %{version}-%{release} Requires: %{name}-gb-qt4-opengl = %{version}-%{release} Requires: %{name}-gb-qt4-webkit = %{version}-%{release} +Requires: %{name}-gb-qt5 = %{version}-%{release} +Requires: %{name}-gb-qt5-opengl = %{version}-%{release} +Requires: %{name}-gb-qt5-webkit = %{version}-%{release} Requires: %{name}-gb-report = %{version}-%{release} Requires: %{name}-gb-report2 = %{version}-%{release} Requires: %{name}-gb-scanner = %{version}-%{release} @@ -369,6 +374,15 @@ Requires: %{name}-gb-form = %{version}-%{release} %description gb-form-dialog %{summary} +%package gb-form-editor +Summary: Gambas3 component package for form-editor +Group: Development/Tools +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-form = %{version}-%{release} + +%description gb-form-editor +%{summary} + %package gb-form-mdi Summary: Gambas3 component package for form-mdi Group: Development/Tools @@ -720,6 +734,34 @@ Requires: %{name}-gb-qt4 = %{version}-%{release} %description gb-qt4-webkit %{summary} +%package gb-qt5 +Summary: Gambas3 component package for qt5 +Group: Development/Tools +Requires: %{name}-runtime = %{version}-%{release} + +%description gb-qt5 +%{summary} + +%package gb-qt5-opengl +Summary: Gambas3 component package for qt5-opengl +Group: Development/Tools +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-qt5 = %{version}-%{release} +Requires: %{name}-gb-opengl = %{version}-%{release} + +%description gb-qt5-opengl +%{summary} + +%package gb-qt5-webkit +Summary: Gambas3 component package for qt5-webkit +Group: Development/Tools +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-qt5 = %{version}-%{release} + +%description gb-qt5-webkit +%{summary} + + %package gb-report Summary: Gambas3 component package for report Group: Development/Tools @@ -930,6 +972,7 @@ MY_CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'` --with-poppler-libraries=%{_libdir} \ --with-postgresql-libraries=%{_libdir} \ --with-qt4-libraries=%{_libdir} \ + --with-qt5-libraries=%{_libdir} \ --with-qtopengl-libraries=%{_libdir} \ --with-sdl-libraries=%{_libdir} \ --with-sdl_sound-libraries=%{_libdir} \ @@ -946,7 +989,8 @@ for i in main; do sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $i/libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $i/libtool done -%{__make} LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} +# %{__make} LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} V=1 +%{__make} %{?_smp_mflags} V=1 %install export PATH=%{buildroot}%{_bindir}:$PATH @@ -1144,6 +1188,13 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/%{name}/info/gb.form.dialog.info %{_datadir}/%{name}/info/gb.form.dialog.list +%files gb-form-editor +%{_libdir}/%{name}/gb.form.editor.component +%{_libdir}/%{name}/gb.form.editor.gambas +%{_datadir}/%{name}/control/gb.form.editor/ +%{_datadir}/%{name}/info/gb.form.editor.info +%{_datadir}/%{name}/info/gb.form.editor.list + %files gb-form-mdi %{_libdir}/%{name}/gb.form.mdi.component %{_libdir}/%{name}/gb.form.mdi.gambas @@ -1365,6 +1416,22 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_libdir}/%{name}/gb.qt4.webkit.* %{_datadir}/%{name}/info/gb.qt4.webkit.* +%files gb-qt5 +%{_libdir}/%{name}/gb.qt5.component +# %{_libdir}/%{name}/gb.qt5.gambas +%{_libdir}/%{name}/gb.qt5.so* +%{_libdir}/%{name}/gb.qt5.la +%{_datadir}/%{name}/info/gb.qt5.info +%{_datadir}/%{name}/info/gb.qt5.list + +%files gb-qt5-opengl +%{_libdir}/%{name}/gb.qt5.opengl.* +%{_datadir}/%{name}/info/gb.qt5.opengl.* + +%files gb-qt5-webkit +%{_libdir}/%{name}/gb.qt5.webkit.* +%{_datadir}/%{name}/info/gb.qt5.webkit.* + %files gb-report %{_libdir}/%{name}/gb.report.* %{_datadir}/%{name}/control/gb.report/ @@ -1397,8 +1464,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_libdir}/%{name}/gb.sdl2.so %{_libdir}/%{name}/gb.sdl2.so.* %{_libdir}/%{name}/gb.sdl2.la -%{_datadir}/%{name}/info/gb.sdl2.info -%{_datadir}/%{name}/info/gb.sdl2.list +# %{_datadir}/%{name}/info/gb.sdl2.info +# %{_datadir}/%{name}/info/gb.sdl2.list %files gb-sdl2-audio %{_libdir}/%{name}/gb.sdl2.audio.component @@ -1464,6 +1531,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/%{name}/info/gb.xml.xslt.* %changelog +* Tue Aug 4 2015 Tom Callaway - 3.8.0-1 +- update to 3.8.0 + +* Wed Jul 22 2015 Marek Kasik - 3.7.1-4 +- Rebuild (poppler-0.34.0) + +* Wed Jun 17 2015 Fedora Release Engineering - 3.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Jun 11 2015 Tom Callaway - 3.7.1-2 - provides/obsoletes the old -examples subpackage diff --git a/sources b/sources index d756995..2abc8da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ad89b7a16c90117a540f6d7ba0d2369 gambas3-3.7.1.tar.bz2 +4f5362e1bfa671509c0de276d2d53798 gambas3-3.8.0.tar.bz2