Compare commits

...

5 Commits
master ... f33

Author SHA1 Message Date
Neal Gompa 47077306a9 Rebase to 3.10.0 (#1669818) 2020-08-01 13:56:09 -04:00
Fedora Release Engineering 01610aba38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 06:00:41 +00:00
Igor Raits 78de4736fb
Improve compatibility with new CMake macro
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-08 17:11:31 +02:00
Fedora Release Engineering 1a830688af - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 10:55:00 +00:00
Jitka Plesnikova 8edad17cfa Fix FTBFS - updated path of hardlink 2019-08-14 15:21:09 +02:00
3 changed files with 33 additions and 49 deletions

View File

@ -1,20 +0,0 @@
--- a/src/YDialog.cc
+++ b/src/YDialog.cc
@@ -687,7 +687,7 @@ YDialog::showText( const std::string & text, bool useRichText )
dialog->waitForEvent();
dialog->destroy();
}
- catch ( YUIException exception )
+ catch ( const YUIException & exception )
{
// Don't let the application die just because help couldn't be displayed.
@@ -811,7 +811,7 @@ YDialog::showRelNotesText()
}
dialog->destroy();
}
- catch ( YUIException exception )
+ catch ( const YUIException & exception )
{
// Don't let the application die just because RN couldn't be displayed.

View File

@ -1,4 +1,6 @@
%global major_so_ver 8
%undefine __cmake_in_source_build
%global major_so_ver 12
# Place rpm-macros into proper location.
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@ -9,20 +11,15 @@
# Define libsuffix.
%global libsuffix yui
# CMake-builds go out-of-tree.
%global _cmake_build_subdir build-%{_target_platform}
Name: lib%{libsuffix}
Version: 3.3.3
Release: 6%{?dist}
Version: 3.10.0
Release: 1%{?dist}
Summary: GUI-abstraction library
License: (LGPLv2 or LGPLv3) and MIT
URL: https://github.com/%{name}/%{name}
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
# Based on https://github.com/libyui/libyui/commit/b1f593cd99fd33cc3f0cf9b4f5151f672b68d96e
Patch0: fix_gcc8.patch
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: boost-devel
@ -69,31 +66,27 @@ brief examples how to build a UI using %{name}.
%build
%{__mkdir} -p %{_cmake_build_subdir}
pushd %{_cmake_build_subdir}
%cmake \
-DYPREFIX=%{_prefix} \
-DLIB_DIR=%{_libdir} \
-DCMAKE_BUILD_TYPE=RELEASE \
-DRESPECT_FLAGS=ON \
-DSKIP_LATEX=ON \
..
%{nil}
%make_build
%make_build docs
popd
%cmake_build
%cmake_build --target docs
%install
pushd %{_cmake_build_subdir}
%{__mkdir} -p %{buildroot}%{_libdir}/%{libsuffix} \
mkdir -p %{buildroot}%{_libdir}/%{libsuffix} \
%{buildroot}%{_datadir}/%{name}/theme
%make_install
%cmake_install
# Create a macro for use in other spec-files.
%{__mkdir} -p %{buildroot}/%{macrosdir}
%{__cat} << EOF > %{buildroot}/%{macrosdir}/macros.%{name}
mkdir -p %{buildroot}/%{macrosdir}
cat << EOF > %{buildroot}/%{macrosdir}/macros.%{name}
%_%{name}_major_so_ver %{major_so_ver}
%_%{name}_datadir %%{_datadir}/%{name}
%_%{name}_includedir %%{_includedir}/%{libsuffix}
@ -102,19 +95,18 @@ pushd %{_cmake_build_subdir}
EOF
# Delete obsolete files.
%{__rm} -rf %{buildroot}%{_defaultdocdir} \
../examples/{CMake*,.gitignore} \
doc/html/*.m*
rm -rf %{buildroot}%{_defaultdocdir} \
examples/{CMake*,.gitignore} \
%{_vpath_builddir}/doc/html/*.m*
# Install documentation.
%{__mkdir} -p %{buildroot}%{?_pkgdocdir}
%{__cp} -a ../README.md ../package/libyui.changes \
../examples/ doc/html/ \
mkdir -p %{buildroot}%{?_pkgdocdir}
cp -a README.md package/libyui.changes \
examples/ %{_vpath_builddir}/doc/html/ \
%{buildroot}%{?_pkgdocdir}
# Hard-link documentation.
%{_sbindir}/hardlink -cv %{buildroot}%{?_pkgdocdir}/html
popd
%{_bindir}/hardlink -cv %{buildroot}%{?_pkgdocdir}/html
%ldconfig_scriptlets
@ -149,6 +141,18 @@ popd
%changelog
* Sat Aug 01 2020 Neal Gompa <ngompa13@gmail.com> - 3.10.0-1
- Rebase to 3.10.0 (#1669818)
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Aug 14 2019 Jitka Plesnikova <jplesnik@redhat.com> - 3.3.3-7
- Fix FTBFS - updated path of hardlink
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (libyui-3.3.3.tar.gz) = 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f
SHA512 (libyui-3.10.0.tar.gz) = 8c3186fdff7b3f6f49b25dcb7085f3906a2fa59b7e951b52a9c3aef62eb2b4941cfcfa59da334d4cc9445152130afe3214bd70b9e2efef67dbb9186a439b0d85