[Arch-excludes] Architecture specific change in rpms/gambas3.git

The package rpms/gambas3.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gambas3.git/commit/?id=2d25d07150.... Change: +%ifnarch ppc64le s390x Thanks. Full change: ============ commit 2d25d0715076b44082090cba41fd6d56d3ff25cb Author: Tom spot Callaway <spot(a)fedoraproject.org&gt; Date: Wed May 5 12:41:28 2021 -0400 no qt5-webview subpackage for ppc64le/s390x because no qt5-qtwebengine-devel there diff --git a/gambas3.spec b/gambas3.spec index 64a4092..6bf30c7 100644 --- a/gambas3.spec +++ b/gambas3.spec @@ -31,7 +31,10 @@ BuildRequires: imlib2-devel, qt-webkit-devel, gsl-devel BuildRequires: libtool, ncurses-devel, libX11-devel BuildRequires: gmime-devel, libgnome-keyring-devel BuildRequires: qt5-qtsvg-devel, qt5-qtbase-devel, qt5-qtx11extras-devel, qt5-qtwebkit-devel -BuildRequires: qt5-qtwebengine-devel, poppler-cpp-devel +%ifnarch ppc64le s390x +BuildRequires: qt5-qtwebengine-devel +%endif +BuildRequires: poppler-cpp-devel # We need this since linux/videodev.h is dead BuildRequires: libv4l-devel BuildRequires: openssl-devel, gmp-devel, glew-devel @@ -1563,9 +1566,11 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_datadir}/%{name}/control/gb.qt5.webkit* %{_datadir}/%{name}/info/gb.qt5.webkit.* +%ifnarch ppc64le s390x %files gb-qt5-webview %{_libdir}/%{name}/gb.qt5.webview.* %{_datadir}/%{name}/info/gb.qt5.webview.* +%endif %files gb-qt5-x11 %{_libdir}/%{name}/gb.qt5.x11.* commit 9c989dec1451779bf47091c6b2babe348b1aef1c Author: Tom spot Callaway <spot(a)fedoraproject.org&gt; Date: Wed May 5 11:11:19 2021 -0400 fix missing BR diff --git a/gambas3.spec b/gambas3.spec index a2d84b7..64a4092 100644 --- a/gambas3.spec +++ b/gambas3.spec @@ -31,6 +31,7 @@ BuildRequires: imlib2-devel, qt-webkit-devel, gsl-devel BuildRequires: libtool, ncurses-devel, libX11-devel BuildRequires: gmime-devel, libgnome-keyring-devel BuildRequires: qt5-qtsvg-devel, qt5-qtbase-devel, qt5-qtx11extras-devel, qt5-qtwebkit-devel +BuildRequires: qt5-qtwebengine-devel, poppler-cpp-devel # We need this since linux/videodev.h is dead BuildRequires: libv4l-devel BuildRequires: openssl-devel, gmp-devel, glew-devel commit 771d479da7f2710e53df2bdbba32cfe6a46ed418 Author: Tom spot Callaway <spot(a)fedoraproject.org&gt; Date: Wed May 5 10:13:17 2021 -0400 3.16.0 diff --git a/.gitignore b/.gitignore index 50ae2d0..dcf3aa9 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /gambas-3.15.0.tar.bz2 /gambas-3.15.1.tar.bz2 /gambas-3.15.2.tar.bz2 +/gambas-3.16.0.tar.bz2 diff --git a/gambas3-3.15.2-poppler-splash.patch b/gambas3-3.15.2-poppler-splash.patch deleted file mode 100644 index dee5a58..0000000 --- a/gambas3-3.15.2-poppler-splash.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gambas-3.15.2/gb.poppler/configure.ac -+++ gambas-3.15.2/gb.poppler/configure.ac -@@ -9,6 +9,6 @@ GB_COMPONENT_PKG_CONFIG( - POPPLER, - gb.poppler, - [src], -- 'poppler >= 0.20' poppler-splash poppler-glib) -+ 'poppler >= 0.20' poppler-glib) - AC_OUTPUT( Makefile src/Makefile ) - GB_PRINT_MESSAGES diff --git a/gambas3.spec b/gambas3.spec index 8f108d7..a2d84b7 100644 --- a/gambas3.spec +++ b/gambas3.spec @@ -7,8 +7,8 @@ Name: gambas3 Summary: IDE based on a basic interpreter with object extensions -Version: 3.15.2 -Release: 5%{?dist} +Version: 3.16.0 +Release: 1%{?dist} License: GPL+ URL: http://gambas.sourceforge.net/ Source0: https://gitlab.com/gambas/gambas/-/archive/%{version}/gambas-%{version}.t... @@ -28,7 +28,7 @@ BuildRequires: xdg-utils, glibc-devel, libffi-devel BuildRequires: cairo-devel, qt4-devel, dbus-devel, libXcursor-devel BuildRequires: SDL_ttf-devel, sqlite2-devel, glew-devel BuildRequires: imlib2-devel, qt-webkit-devel, gsl-devel -BuildRequires: libtool, ncurses-devel +BuildRequires: libtool, ncurses-devel, libX11-devel BuildRequires: gmime-devel, libgnome-keyring-devel BuildRequires: qt5-qtsvg-devel, qt5-qtbase-devel, qt5-qtx11extras-devel, qt5-qtwebkit-devel # We need this since linux/videodev.h is dead @@ -37,6 +37,7 @@ BuildRequires: openssl-devel, gmp-devel, glew-devel BuildRequires: gstreamer1-plugins-base-devel gstreamer1-devel BuildRequires: openal-soft-devel, alure-devel BuildRequires: pkgconfig(x11), pkgconfig(gl) +BuildRequires: pkgconfig(webkit2gtk-4.0), pkgconfig(libzstd) # Something on arm is pulling this in... BuildRequires: dumb-devel BuildRequires: fluidsynth-devel @@ -48,7 +49,6 @@ BuildRequires: make Patch1: %{name}-3.12.2-nolintl.patch Patch2: %{name}-3.12.2-noliconv.patch Patch5: %{name}-3.14.1-gst1.patch -Patch6: %{name}-3.15.2-poppler-splash.patch %description Gambas3 is a free development environment based on a Basic interpreter @@ -62,55 +62,58 @@ on... Summary: Runtime environment for Gambas3 Provides: %{name}-gb-gui = %{version}-%{release} Obsoletes: %{name}-gb-gui <= 3.4 +Provides: %{name}-gb-test = %{version}-%{release} +Obsoletes: %{name}-gb-test <= 3.15.2 %description runtime Gambas3 is a free development environment based on a Basic interpreter with object extensions, like Visual Basic. This package contains the runtime components necessary to run programs designed in Gambas3. -%package devel +%package dev-tools Summary: Development environment for Gambas3 Requires: %{name}-runtime = %{version}-%{release} +Provides: %{name}-devel = %{version}-%{release} +Obsoletes: %{name}-devel <= 3.15.2 -%description devel -The gambas3-devel package contains the tools needed to compile Gambas3 +%description dev-tools +The gambas3-dev-tools package contains the tools needed to compile Gambas3 projects without having to install the complete development environment (gambas3-ide). %package scripter Summary: Scripter program that allows the creation of Gambas3 scripts Requires: %{name}-runtime = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-dev-tools = %{version}-%{release} +Requires: %{name}-gb-pcre = %{version}-%{release} %description scripter This package includes the scripter program that allows the user to write script files in Gambas. +%package gui +Summary: Virtual package for Gambas3 packages that just need a gui +Requires: (gambas3-gb-qt4 = %{version}-%{release} or gambas3-gb-qt5 = %{version}-%{release} or gambas3-gb-gtk = %{version}-%{release} or gambas3-gb-gtk3 = %{version}-%{release}) + +%description gui +This package is a virtual package that depends on one of the following +packages: gambas3-gb-qt4, gambas3-gb-qt5, gambas3-gb-gtk, gambas3-gb-gtk3. +It is used as a dependency for packages that requires any GUI package (like +gambas3-gb-form). + %package ide Summary: The complete Gambas3 Development Environment License: GPL+ Provides: %{name} = %{version}-%{release} -Requires: tar, gzip, rpm-build, gettext +Requires: tar, gzip, rpm-build, gettext, wget +Recommends: pngquant, translate-shell, git, subversion Requires: %{name}-runtime = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Requires: %{name}-gb-args = %{version}-%{release} -Requires: %{name}-gb-cairo = %{version}-%{release} -Requires: %{name}-gb-chart = %{version}-%{release} +Requires: %{name}-dev-tools = %{version}-%{release} Requires: %{name}-gb-clipper = %{version}-%{release} -Requires: %{name}-gb-complex = %{version}-%{release} -Requires: %{name}-gb-compress = %{version}-%{release} -Requires: %{name}-gb-crypt = %{version}-%{release} -Requires: %{name}-gb-data = %{version}-%{release} Requires: %{name}-gb-db = %{version}-%{release} Requires: %{name}-gb-db-form = %{version}-%{release} -Requires: %{name}-gb-db-mysql = %{version}-%{release} -Requires: %{name}-gb-db-odbc = %{version}-%{release} -Requires: %{name}-gb-db-postgresql = %{version}-%{release} -Requires: %{name}-gb-db-sqlite2 = %{version}-%{release} -Requires: %{name}-gb-db-sqlite3 = %{version}-%{release} -Requires: %{name}-gb-dbus = %{version}-%{release} Requires: %{name}-gb-desktop = %{version}-%{release} -Requires: %{name}-gb-desktop-gnome = %{version}-%{release} +Requires: %{name}-gb-desktop-x11 = %{version}-%{release} Requires: %{name}-gb-eval-highlight = %{version}-%{release} Requires: %{name}-gb-form = %{version}-%{release} Requires: %{name}-gb-form-dialog = %{version}-%{release} @@ -119,92 +122,27 @@ Requires: %{name}-gb-form-mdi = %{version}-%{release} Requires: %{name}-gb-form-print = %{version}-%{release} Requires: %{name}-gb-form-stock = %{version}-%{release} Requires: %{name}-gb-form-terminal = %{version}-%{release} -Requires: %{name}-gb-gmp = %{version}-%{release} -Requires: %{name}-gb-gsl = %{version}-%{release} -Requires: %{name}-gb-gtk = %{version}-%{release} -%if %{gtkopengl} -Requires: %{name}-gb-gtk-opengl = %{version}-%{release} -%else -Provides: %{name}-gb-gtk-opengl = %{version}-%{release} -Obsoletes: %{name}-gb-gtk-opengl < 3.14.3-4 -%endif -Requires: %{name}-gb-gtk3 = %{version}-%{release} -Requires: %{name}-gb-httpd = %{version}-%{release} Requires: %{name}-gb-image = %{version}-%{release} -Requires: %{name}-gb-image-effect = %{version}-%{release} -Requires: %{name}-gb-image-imlib = %{version}-%{release} -Requires: %{name}-gb-image-io = %{version}-%{release} -Requires: %{name}-gb-inotify = %{version}-%{release} -%if %{enablejit} +# This isn't stated as a requirement upstream, but it clearly needed it in my testing +%if 0%{enablejit} Requires: %{name}-gb-jit = %{version}-%{release} -%else -# This is a lie, but we want to clean it out when we're going. -Provides: %{name}-gb-jit = %{version}-%{release} -Obsoletes: %{name}-gb-jit < 3.7.1 %endif -Requires: %{name}-gb-libxml = %{version}-%{release} -Requires: %{name}-gb-logging = %{version}-%{release} -Requires: %{name}-gb-map = %{version}-%{release} Requires: %{name}-gb-markdown = %{version}-%{release} -Requires: %{name}-gb-media = %{version}-%{release} -Requires: %{name}-gb-media-form = %{version}-%{release} -Requires: %{name}-gb-memcached = %{version}-%{release} -Requires: %{name}-gb-mime = %{version}-%{release} -Requires: %{name}-gb-mysql = %{version}-%{release} -Requires: %{name}-gb-ncurses = %{version}-%{release} Requires: %{name}-gb-net = %{version}-%{release} Requires: %{name}-gb-net-curl = %{version}-%{release} -Requires: %{name}-gb-net-pop3 = %{version}-%{release} -Requires: %{name}-gb-net-smtp = %{version}-%{release} -Requires: %{name}-gb-openal = %{version}-%{release} -Requires: %{name}-gb-opengl = %{version}-%{release} -Requires: %{name}-gb-opengl-glu = %{version}-%{release} -Requires: %{name}-gb-opengl-glsl = %{version}-%{release} -Requires: %{name}-gb-opengl-sge = %{version}-%{release} -Requires: %{name}-gb-openssl = %{version}-%{release} -Requires: %{name}-gb-option = %{version}-%{release} -Requires: %{name}-gb-pcre = %{version}-%{release} -Requires: %{name}-gb-pdf = %{version}-%{release} -Requires: %{name}-gb-poppler = %{version}-%{release} -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-ext = %{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} -Requires: %{name}-gb-sdl = %{version}-%{release} -Requires: %{name}-gb-sdl-sound = %{version}-%{release} -Requires: %{name}-gb-sdl2 = %{version}-%{release} -Requires: %{name}-gb-sdl2-audio = %{version}-%{release} Requires: %{name}-gb-settings = %{version}-%{release} Requires: %{name}-gb-signal = %{version}-%{release} Requires: %{name}-gb-term = %{version}-%{release} -Requires: %{name}-gb-test = %{version}-%{release} Requires: %{name}-gb-util = %{version}-%{release} -Requires: %{name}-gb-util-web = %{version}-%{release} -Requires: %{name}-gb-v4l = %{version}-%{release} -Requires: %{name}-gb-vb = %{version}-%{release} -Requires: %{name}-gb-web = %{version}-%{release} -Requires: %{name}-gb-web-feed = %{version}-%{release} -Requires: %{name}-gb-web-form = %{version}-%{release} -Requires: %{name}-gb-web-gui = %{version}-%{release} -Requires: %{name}-gb-xml = %{version}-%{release} -Requires: %{name}-gb-xml-html = %{version}-%{release} -Requires: %{name}-gb-xml-rpc = %{version}-%{release} -Requires: %{name}-gb-xml-xslt = %{version}-%{release} -# This is a lie, but we need to cleanup -Provides: %{name}-examples = %{version}-%{release} -Obsoletes: %{name}-examples <= 3.7.0 +# Technically, this is either gambas3-gb-qt4-webview or gambas3-gb-qt5-webview or gambas3-gb-gtk3-webview +# Since Fedora is GNOME by default, we go with the gtk3 +Requires: %{name}-gb-gtk3-webview = %{version}-%{release} +# Since Fedora is wayland by default... +Requires: %{name}-gb-gtk3-wayland = %{version}-%{release} %description ide -This package includes the complete Gambas3 Development Environment and the -database manager. Installing this package will give you all of the Gambas3 -components. +This package includes the complete Gambas3 Development Environment. +It pulls in the Gambas3 components necessary for the IDE to function. %package gb-args Summary: Gambas3 component package for args @@ -216,6 +154,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-cairo Summary: Gambas3 component package for cairo Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-image = %{version}-%{release} %description gb-cairo %{summary} @@ -249,6 +188,30 @@ Requires: %{name}-runtime = %{version}-%{release} %description gb-compress %{summary} +%package gb-compress-bzlib2 +Summary: Gambas3 component package for compress-bzlib2 +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-compress = %{version}-%{release} + +%description gb-compress-bzlib2 +%{summary} + +%package gb-compress-zlib +Summary: Gambas3 component package for compress-zlib +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-compress = %{version}-%{release} + +%description gb-compress-zlib +%{summary} + +%package gb-compress-zstd +Summary: Gambas3 component package for compress-zstd +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-compress = %{version}-%{release} + +%description gb-compress-zstd +%{summary} + %package gb-crypt Summary: Gambas3 component package for crypt Requires: %{name}-runtime = %{version}-%{release} @@ -322,16 +285,27 @@ Requires: %{name}-gb-db = %{version}-%{release} %package gb-desktop Summary: Gambas3 component package for desktop Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-desktop %{summary} -%package gb-desktop-gnome -Summary: Gambas3 component package for GNOME Desktop +%package gb-desktop-gnome-keyring +Summary: Gambas3 component package for GNOME Desktop Keyring Requires: %{name}-runtime = %{version}-%{release} Requires: %{name}-gb-desktop = %{version}-%{release} +Provides: %{name}-gb-desktop-gnome = %{version}-%{release} +Obsoletes: %{name}-gb-desktop-gnome <= 3.15.2 -%description gb-desktop-gnome +%description gb-desktop-gnome-keyring +%{summary} + +%package gb-desktop-x11 +Summary: Gambas3 component package for X11 desktop +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} + +%description gb-desktop-x11 %{summary} %package gb-dbus @@ -351,6 +325,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-form Summary: Gambas3 component package for form Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gui = %{version}-%{release} %description gb-form %{summary} @@ -366,6 +341,8 @@ Requires: %{name}-gb-form = %{version}-%{release} %package gb-form-editor Summary: Gambas3 component package for form-editor Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-eval-highlight = %{version}-%{release} +Requires: %{name}-gb-util = %{version}-%{release} Requires: %{name}-gb-form = %{version}-%{release} %description gb-form-editor @@ -399,6 +376,7 @@ Requires: %{name}-runtime = %{version}-%{release} Summary: Gambas3 component package for form-terminal Requires: %{name}-runtime = %{version}-%{release} Requires: %{name}-gb-form = %{version}-%{release} +Requires: %{name}-gui = %{version}-%{release} %description gb-form-terminal %{summary} @@ -420,6 +398,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-gtk Summary: Gambas3 component package for gtk Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-gtk %{summary} @@ -438,10 +417,37 @@ Requires: %{name}-gb-opengl = %{version}-%{release} %package gb-gtk3 Summary: Gambas3 component package for gtk3 Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-gtk3 %{summary}. +%package gb-gtk3-wayland +Summary: Gambas3 component package for gtk3-wayland +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-gtk3 = %{version}-%{release} +Requires: %{name}-gb-qt5 = %{version}-%{release} + +%description gb-gtk3-wayland +%{summary}. + +%package gb-gtk3-webview +Summary: Gambas3 component package for gtk3-webview +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-gtk3 = %{version}-%{release} + +%description gb-gtk3-webview +%{summary}. + +%package gb-gtk3-x11 +Summary: Gambas3 component package for gtk3-x11 +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-gtk3 = %{version}-%{release} +Requires: %{name}-gb-qt5 = %{version}-%{release} + +%description gb-gtk3-x11 +%{summary}. + %package gb-httpd Summary: Gambas3 component package for httpd Requires: %{name}-runtime = %{version}-%{release} @@ -492,6 +498,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-jit Summary: Gambas3 component package for jit Requires: %{name}-runtime = %{version}-%{release} +Requires: gcc %description gb-jit %{summary} @@ -514,6 +521,8 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-map Summary: Gambas3 component package for map Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-net-curl = %{version}-%{release} +Requires: %{name}-gb-net = %{version}-%{release} %description gb-map %{summary}. @@ -528,6 +537,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-media Summary: Gambas3 component package for media Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-media %{summary} @@ -536,6 +546,7 @@ Requires: %{name}-runtime = %{version}-%{release} Summary: Gambas3 component package for media-form Requires: %{name}-gb-media = %{version}-%{release} Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gui = %{version}-%{release} %description gb-media-form %{summary} @@ -543,6 +554,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-memcached Summary: Gambas3 component package for memcached Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-net = %{version}-%{release} %description gb-memcached %{summary}. @@ -597,6 +609,7 @@ Requires: %{name}-gb-mime = %{version}-%{release} %package gb-net-smtp Summary: Gambas3 component package for net-smtp Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-net = %{version}-%{release} %description gb-net-smtp %{summary} @@ -611,6 +624,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-opengl Summary: Gambas3 component package for opengl Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-opengl %{summary} @@ -663,6 +677,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-pdf Summary: Gambas3 component package for pdf Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-pdf %{summary} @@ -670,6 +685,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-poppler Summary: Gambas3 component package for poppler Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-poppler %{summary} @@ -677,6 +693,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-qt4 Summary: Gambas3 component package for qt4 Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-qt4 %{summary} @@ -706,9 +723,18 @@ Requires: %{name}-gb-qt4 = %{version}-%{release} %description gb-qt4-webkit %{summary} +%package gb-qt4-webview +Summary: Gambas3 component package for qt4-webview +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-qt4 = %{version}-%{release} + +%description gb-qt4-webview +%{summary} + %package gb-qt5 Summary: Gambas3 component package for qt5 Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-qt5 %{summary} @@ -730,6 +756,14 @@ Requires: %{name}-gb-opengl = %{version}-%{release} %description gb-qt5-opengl %{summary} +%package gb-qt5-wayland +Summary: Gambas3 component package for qt5-wayland +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-qt5 = %{version}-%{release} + +%description gb-qt5-wayland +%{summary} + %package gb-qt5-webkit Summary: Gambas3 component package for qt5-webkit Requires: %{name}-runtime = %{version}-%{release} @@ -738,10 +772,26 @@ Requires: %{name}-gb-qt5 = %{version}-%{release} %description gb-qt5-webkit %{summary} +%package gb-qt5-webview +Summary: Gambas3 component package for qt5-webview +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-qt5 = %{version}-%{release} + +%description gb-qt5-webview +%{summary} + +%package gb-qt5-x11 +Summary: Gambas3 component package for qt5-x11 +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-qt5 = %{version}-%{release} + +%description gb-qt5-x11 +%{summary} %package gb-report Summary: Gambas3 component package for report Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-form = %{version}-%{release} %description gb-report %{summary} @@ -749,6 +799,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-report2 Summary: Gambas3 component package for report2 Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-form = %{version}-%{release} %description gb-report2 %{summary} @@ -763,6 +814,8 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-sdl Summary: Gambas3 component package for sdl Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} +Requires: %{name}-gb-image-io = %{version}-%{release} Requires: dejavu-sans-fonts %description gb-sdl @@ -778,6 +831,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-sdl2 Summary: Gambas3 component for sdl2 Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-sdl2 %{summary} @@ -810,11 +864,11 @@ Requires: %{name}-runtime = %{version}-%{release} %description gb-term %{summary} -%package gb-test -Summary: Gambas3 component package for unit tests -Requires: %{name}-runtime = %{version}-%{release} +%package gb-term-form +Summary: Gambas3 component package for term-form +Requires: %{name}-runtime = %{version}-%{release} -%description gb-test +%description gb-term-form %{summary} %package gb-util @@ -834,6 +888,7 @@ Requires: %{name}-runtime = %{version}-%{release} %package gb-v4l Summary: Gambas3 component package for v4l Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-gb-image = %{version}-%{release} %description gb-v4l %{summary} @@ -856,6 +911,8 @@ Requires: %{name}-runtime = %{version}-%{release} Summary: Gambas3 component package for web-feed Requires: %{name}-runtime = %{version}-%{release} Requires: %{name}-gb-web = %{version}-%{release} +Requires: %{name}-gb-xml = %{version}-%{release} +Requires: %{name}-gb-util = %{version}-%{release} %description gb-web-feed %{summary} @@ -864,6 +921,8 @@ Requires: %{name}-gb-web = %{version}-%{release} Summary: Gambas3 component package for web-form Requires: %{name}-runtime = %{version}-%{release} Requires: %{name}-gb-web = %{version}-%{release} +Requires: %{name}-gb-util-web = %{version}-%{release} +Requires: %{name}-gb-util = %{version}-%{release} %description gb-web-form %{summary} @@ -872,6 +931,9 @@ Requires: %{name}-gb-web = %{version}-%{release} Summary: Gambas3 component package for web-gui Requires: %{name}-runtime = %{version}-%{release} Requires: %{name}-gb-web = %{version}-%{release} +Requires: %{name}-gb-util = %{version}-%{release} +Requires: %{name}-gb-util-web = %{version}-%{release} +Requires: %{name}-gb-signal = %{version}-%{release} %description gb-web-gui %{summary} @@ -895,7 +957,6 @@ Requires: %{name}-gb-xml = %{version}-%{release} %package gb-xml-rpc Summary: Gambas3 component package for xml.rpc Requires: %{name}-runtime = %{version}-%{release} -Requires: %{name}-gb-xml = %{version}-%{release} %description gb-xml-rpc %{summary} @@ -913,7 +974,6 @@ Requires: %{name}-gb-xml = %{version}-%{release} %patch1 -p1 -b .nolintl %patch2 -p1 -b .noliconv %patch5 -p1 -b .gst1 -%patch6 -p1 -b .poppler-splash for i in `find . |grep acinclude.m4`; do sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i sed -i 's|$AM_CXXFLAGS -Os -fno-omit-frame-pointer|$AM_CXXFLAGS|g' $i @@ -1032,6 +1092,7 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_libdir}/%{name}/gb.eval.* %{_libdir}/%{name}/gb.geom.* %{_libdir}/%{name}/gb.gui.* +%{_libdir}/%{name}/gb.test.* %{_bindir}/gbr3 %{_bindir}/gbx3 %{_datadir}/pixmaps/%{name}.png @@ -1044,14 +1105,12 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_datadir}/%{name}/info/gb.gui.* %{_datadir}/%{name}/info/gb.info %{_datadir}/%{name}/info/gb.list -%dir %{_datadir}/%{name}/icons/ -%{_datadir}/%{name}/icons/application-x-gambas3.png +%{_datadir}/%{name}/info/gb.test.* %{_datadir}/mime/packages/application-x-gambas3.xml -%{_datadir}/%{name}/icons/application-x-gambasserverpage.png %{_mandir}/man1/gbr3.* %{_mandir}/man1/gbx3.* -%files devel +%files dev-tools %license COPYING %{_bindir}/gbc3 %{_bindir}/gba3 @@ -1067,11 +1126,12 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_bindir}/gbs3 %{_bindir}/gbs3.gambas %{_bindir}/gbw3 -%{_datadir}/%{name}/icons/application-x-gambasscript.png %{_datadir}/mime/packages/application-x-gambasscript.xml %{_mandir}/man1/gbs3.* %{_mandir}/man1/gbw3.* +%files gui + %files ide %{_bindir}/%{name} %{_bindir}/%{name}.gambas @@ -1103,8 +1163,23 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_datadir}/%{name}/info/gb.complex.* %files gb-compress -%{_libdir}/%{name}/gb.compress.* -%{_datadir}/%{name}/info/gb.compress.* +%{_libdir}/%{name}/gb.compress.component +%{_libdir}/%{name}/gb.compress.la +%{_libdir}/%{name}/gb.compress.so* +%{_datadir}/%{name}/info/gb.compress.info +%{_datadir}/%{name}/info/gb.compress.list + +%files gb-compress-bzlib2 +%{_libdir}/%{name}/gb.compress.bzlib2.* +%{_datadir}/%{name}/info/gb.compress.bzlib2.* + +%files gb-compress-zlib +%{_libdir}/%{name}/gb.compress.zlib.* +%{_datadir}/%{name}/info/gb.compress.zlib.* + +%files gb-compress-zstd +%{_libdir}/%{name}/gb.compress.zstd.* +%{_datadir}/%{name}/info/gb.compress.zstd.* %files gb-crypt %{_libdir}/%{name}/gb.crypt.* @@ -1153,12 +1228,20 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %files gb-desktop %{_libdir}/%{name}/gb.desktop.* -%exclude %{_libdir}/%{name}/gb.desktop.gnome.* +%exclude %{_libdir}/%{name}/gb.desktop.gnome.keyring.* +%exclude %{_libdir}/%{name}/gb.desktop.x11.* %{_datadir}/%{name}/control/gb.desktop/ +%exclude %{_datadir}/%{name}/info/gb.desktop.gnome.keyring.* +%exclude %{_datadir}/%{name}/info/gb.desktop.x11.* %{_datadir}/%{name}/info/gb.desktop.* -%files gb-desktop-gnome -%{_libdir}/%{name}/gb.desktop.gnome.* +%files gb-desktop-gnome-keyring +%{_libdir}/%{name}/gb.desktop.gnome.keyring.* +%{_datadir}/%{name}/info/gb.desktop.gnome.keyring.* + +%files gb-desktop-x11 +%{_libdir}/%{name}/gb.desktop.x11.* +%{_datadir}/%{name}/info/gb.desktop.x11.* %files gb-eval-highlight %{_libdir}/%{name}/gb.eval.highlight.* @@ -1245,6 +1328,28 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_datadir}/%{name}/info/gb.gtk3.info %{_datadir}/%{name}/info/gb.gtk3.list +%files gb-gtk3-wayland +%{_libdir}/%{name}/gb.gtk3.wayland.component +%{_libdir}/%{name}/gb.gtk3.wayland.so* +%{_libdir}/%{name}/gb.gtk3.wayland.la +%{_datadir}/%{name}/info/gb.gtk3.wayland.info +%{_datadir}/%{name}/info/gb.gtk3.wayland.list + +%files gb-gtk3-webview +%{_libdir}/%{name}/gb.gtk3.webview.component +%{_libdir}/%{name}/gb.gtk3.webview.so* +%{_libdir}/%{name}/gb.gtk3.webview.la +%{_datadir}/%{name}/info/gb.gtk3.webview.info +%{_datadir}/%{name}/info/gb.gtk3.webview.list + +%files gb-gtk3-x11 +%{_libdir}/%{name}/gb.gtk3.x11.component +%{_libdir}/%{name}/gb.gtk3.x11.so* +%{_libdir}/%{name}/gb.gtk3.x11.la +%{_datadir}/%{name}/info/gb.gtk3.x11.info +%{_datadir}/%{name}/info/gb.gtk3.x11.list + + %files gb-httpd %{_libdir}/%{name}/gb.httpd.* %{_datadir}/%{name}/info/gb.httpd.* @@ -1428,6 +1533,10 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_datadir}/%{name}/control/gb.qt4.webkit* %{_datadir}/%{name}/info/gb.qt4.webkit.* +%files gb-qt4-webview +%{_libdir}/%{name}/gb.qt4.webview.* +%{_datadir}/%{name}/info/gb.qt4.webview.* + %files gb-qt5 %{_libdir}/%{name}/gb.qt5.component # %%{_libdir}/%%{name}/gb.qt5.gambas @@ -1444,11 +1553,23 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_libdir}/%{name}/gb.qt5.opengl.* %{_datadir}/%{name}/info/gb.qt5.opengl.* +%files gb-qt5-wayland +%{_libdir}/%{name}/gb.qt5.wayland.* +%{_datadir}/%{name}/info/gb.qt5.wayland.* + %files gb-qt5-webkit %{_libdir}/%{name}/gb.qt5.webkit.* %{_datadir}/%{name}/control/gb.qt5.webkit* %{_datadir}/%{name}/info/gb.qt5.webkit.* +%files gb-qt5-webview +%{_libdir}/%{name}/gb.qt5.webview.* +%{_datadir}/%{name}/info/gb.qt5.webview.* + +%files gb-qt5-x11 +%{_libdir}/%{name}/gb.qt5.x11.* +%{_datadir}/%{name}/info/gb.qt5.x11.* + %files gb-report %{_libdir}/%{name}/gb.report.* %{_datadir}/%{name}/control/gb.report/ @@ -1501,14 +1622,17 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_datadir}/%{name}/info/gb.signal.* %files gb-term +%exclude %{_libdir}/%{name}/gb.term.form.* %{_libdir}/%{name}/gb.term.* +%exclude %{_datadir}/%{name}/control/gb.term.form* %{_datadir}/%{name}/control/gb.term.* +%exclude %{_datadir}/%{name}/info/gb.term.form.* %{_datadir}/%{name}/info/gb.term.* -%files gb-test -%{_libdir}/%{name}/gb.test.* -%{_datadir}/%{name}/info/gb.test.info -%{_datadir}/%{name}/info/gb.test.list +%files gb-term-form +%{_libdir}/%{name}/gb.term.form.* +%{_datadir}/%{name}/control/gb.term.form* +%{_datadir}/%{name}/info/gb.term.form.* %files gb-util %{_libdir}/%{name}/gb.util.component @@ -1580,6 +1704,10 @@ install -m 0644 -p main/mime/application-x-gambas3.xml %{buildroot}%{_datadir}/m %{_datadir}/%{name}/info/gb.xml.xslt.* %changelog +* Tue May 4 2021 Tom Callaway <spot(a)fedoraproject.org&gt; - 3.16.0-1 +- update to 3.16.0 +- adjust package to meet new upstream rules + * Mon Feb 08 2021 Pavel Raiskup <praiskup(a)redhat.com&gt; - 3.15.2-5 - rebuild for libpq ABI fix rhbz#1908268 diff --git a/sources b/sources index 6cef691..9702438 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gambas-3.15.2.tar.bz2) = c1ccc08f24380fcf74c83c4b88edb30461e4116e133b3ad9903ae0c4e67a2c2a4968c0ad482b505dd853c59001dff3b28207abce2fa841842b3f523c79c348c4 +SHA512 (gambas-3.16.0.tar.bz2) = e4bf89228d1bad85cf9940b9aeebaa375d8833e2519e1ca3d45be1fe44c2226528a95e25c4f060f3ed28fe223c1c80b678deabde8c40d81a32b8842addd2b2aa