Accepting request 503006 from X11:common:Factory

1

OBS-URL: https://build.opensuse.org/request/show/503006
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gwenhywfar?expand=0&rev=60
This commit is contained in:
Dominique Leuenberger 2017-06-12 13:35:40 +00:00 committed by Git OBS Bridge
parent 495f49b520
commit e0299db28b
2 changed files with 40 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Jun 10 11:17:28 UTC 2017 - wbauer@tmo.at
- Enable Qt5 front-end
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 30 21:33:32 UTC 2017 - nico.kruber@gmail.com Tue May 30 21:33:32 UTC 2017 - nico.kruber@gmail.com

View File

@ -33,7 +33,17 @@ BuildRequires: gtk2-devel >= 1.4
BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libgcrypt-devel >= 1.2.0
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
#BuildRequires: qt-devel BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5OpenGL)
BuildRequires: cmake(Qt5PrintSupport)
BuildRequires: cmake(Qt5Sql)
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml)
%if 0%{?fedora} == 15 %if 0%{?fedora} == 15
BuildRequires: fox-devel >= 1.6 BuildRequires: fox-devel >= 1.6
%else %else
@ -57,7 +67,7 @@ communication).
Summary: Multiplatform Helper Library for Other Libraries - Tools Summary: Multiplatform Helper Library for Other Libraries - Tools
License: GPL-2.0+ and LGPL-2.1+ License: GPL-2.0+ and LGPL-2.1+
Group: System/Libraries Group: System/Libraries
Requires: libgwenhywfar60 = %{version} Requires: lib%{name}%{libversion} = %{version}
%description tools %description tools
Gwenhywfar is a base library used to provide OS abstraction functions Gwenhywfar is a base library used to provide OS abstraction functions
@ -129,6 +139,20 @@ communication).
This package provides the Qt4 implementation of the generic UI toolkit. This package provides the Qt4 implementation of the generic UI toolkit.
%package -n libgwengui-qt5-0
Summary: Multiplatform Helper Library for Other Libraries -- Qt5 UI Backend
License: LGPL-2.1+
Group: System/Libraries
%description -n libgwengui-qt5-0
Gwenhywfar is a base library used to provide OS abstraction functions
for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes
some often needed functions (for example, for handling and parsing of
configuration files, reading and writing of XML files, and interprocess
communication).
This package provides the Qt5 implementation of the generic UI toolkit.
%package -n libgwengui-fox16-0 %package -n libgwengui-fox16-0
Summary: FOX interface for Gwenhywfar Summary: FOX interface for Gwenhywfar
License: GPL-2.0+ and LGPL-2.1+ License: GPL-2.0+ and LGPL-2.1+
@ -147,6 +171,7 @@ Requires: lib%{name}%{libversion} = %{version}
Requires: libgwengui-fox16-0 = %{version} Requires: libgwengui-fox16-0 = %{version}
Requires: libgwengui-gtk2-0 = %{version} Requires: libgwengui-gtk2-0 = %{version}
Requires: libgwengui-qt4-0 = %{version} Requires: libgwengui-qt4-0 = %{version}
Requires: libgwengui-qt5-0 = %{version}
%description devel %description devel
Gwenhywfar is a base library used to provide OS abstraction functions Gwenhywfar is a base library used to provide OS abstraction functions
@ -160,6 +185,7 @@ communication etc).
%setup -q %setup -q
%build %build
export PATH=%{_libqt5_bindir}:$PATH
# quick fix for $CPP being unset and configure failing to handle include dirs properly # quick fix for $CPP being unset and configure failing to handle include dirs properly
CPP=`which cpp` CPP=`which cpp`
export CPP export CPP
@ -169,7 +195,7 @@ export CPP
--with-docpath=%{_docdir}/%{name}/api \ --with-docpath=%{_docdir}/%{name}/api \
--disable-static \ --disable-static \
--with-qt4-libs=%{_libdir} \ --with-qt4-libs=%{_libdir} \
--with-guis="fox16 qt4 gtk2" \ --with-guis="fox16 qt4 qt5 gtk2" \
--with-plugins-cfgmgr=all \ --with-plugins-cfgmgr=all \
--with-pic --with-pic
%__make %{?smp_mflags} %__make %{?smp_mflags}
@ -253,6 +279,10 @@ rm -rf %{buildroot}
%defattr (-, root, root) %defattr (-, root, root)
%{_libdir}/libgwengui-qt4.so.* %{_libdir}/libgwengui-qt4.so.*
%files -n libgwengui-qt5-0
%defattr (-, root, root)
%{_libdir}/libgwengui-qt5.so.*
%files -n libgwengui-fox16-0 %files -n libgwengui-fox16-0
%defattr (-,root,root) %defattr (-,root,root)
%{_libdir}/libgwengui-fox16.so.* %{_libdir}/libgwengui-fox16.so.*
@ -268,11 +298,13 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/gwengui-gtk2.pc %{_libdir}/pkgconfig/gwengui-gtk2.pc
%{_libdir}/pkgconfig/gwengui-qt4.pc %{_libdir}/pkgconfig/gwengui-qt4.pc
%{_libdir}/pkgconfig/gwengui-qt5.pc
%{_libdir}/pkgconfig/gwengui-fox16.pc %{_libdir}/pkgconfig/gwengui-fox16.pc
%dir %{_libdir}/cmake %dir %{_libdir}/cmake
%{_libdir}/cmake/%{name}-%{devversion} %{_libdir}/cmake/%{name}-%{devversion}
%{_libdir}/cmake/gwengui-cpp-%{devversion} %{_libdir}/cmake/gwengui-cpp-%{devversion}
%{_libdir}/cmake/gwengui-qt4-%{devversion} %{_libdir}/cmake/gwengui-qt4-%{devversion}
%{_libdir}/cmake/gwengui-qt5-%{devversion}
%files lang -f %{name}.lang %files lang -f %{name}.lang