Compare commits
46 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
512627c357 | ||
|
684eea09de | ||
|
9cae5768ec | ||
|
bd533c635b | ||
|
8b01fe2175 | ||
|
400a9a350f | ||
|
1c2e5bb073 | ||
|
e6cd249ca5 | ||
|
e5a6f90386 | ||
|
0aae6d528d | ||
|
90c69a6fe3 | ||
|
dd58be683b | ||
|
dbc1f8b348 | ||
|
ecf9d112ef | ||
|
9ff9fcad51 | ||
|
8270382d55 | ||
|
b9c8ce4d1b | ||
|
4901626a6f | ||
|
d9a65fd1b7 | ||
|
ce843b1143 | ||
|
52123a11be | ||
|
b31df655ef | ||
|
2f37504034 | ||
|
5d844b864e | ||
|
5659530fa2 | ||
|
893874c167 | ||
|
e45bf1c6a1 | ||
|
0675567cb4 | ||
|
2560839a11 | ||
|
871d406716 | ||
|
a250036050 | ||
|
1b1dfd1ae3 | ||
|
1a9c7c9ad0 | ||
|
163ee0dfc5 | ||
|
acaa31f22a | ||
|
40513c2cb4 | ||
|
e34a7e76b2 | ||
|
4794ab269c | ||
|
e98b97c62e | ||
|
fe89d90561 | ||
|
7a7b988ae6 | ||
|
33f4a6364b | ||
|
e13e8a11cb | ||
|
a17c503670 | ||
|
321737c8ef | ||
|
6bbb58c565 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
|||||||
*.rpm
|
*.rpm
|
||||||
*.tar*
|
*.tar*
|
||||||
results_*/
|
results_*/
|
||||||
|
/libyui.spec
|
||||||
|
20
fix_gcc8.patch
Normal file
20
fix_gcc8.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- 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.
|
||||||
|
|
226
libyui.spec
226
libyui.spec
@ -1,9 +1,7 @@
|
|||||||
# This flag breaks the dependency loop between libyui and ui plugin
|
%global major_so_ver 8
|
||||||
# packages to make it possible to (re)build plugin packages for libyui
|
|
||||||
# ABI changes. Uncomment next line when rebuilding on ABI changes
|
# Place rpm-macros into proper location.
|
||||||
# and don't forget to bump "major_so_ver".
|
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||||
#global no_ui_dep 1
|
|
||||||
%global major_so_ver 6
|
|
||||||
|
|
||||||
# Setup _pkgdocdir if not defined already.
|
# Setup _pkgdocdir if not defined already.
|
||||||
%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||||
@ -12,21 +10,23 @@
|
|||||||
%global libsuffix yui
|
%global libsuffix yui
|
||||||
|
|
||||||
# CMake-builds go out-of-tree.
|
# CMake-builds go out-of-tree.
|
||||||
%global _cmake_build_subdir build-%{?_arch}%{?dist}
|
%global _cmake_build_subdir build-%{_target_platform}
|
||||||
|
|
||||||
Name: lib%{libsuffix}
|
|
||||||
Version: 3.1.5
|
|
||||||
Release: 2%{?dist}
|
|
||||||
Summary: GUI-abstraction library
|
|
||||||
|
|
||||||
License: (LGPLv2 or LGPLv3) and MIT
|
Name: lib%{libsuffix}
|
||||||
URL: https://github.com/%{name}/%{name}
|
Version: 3.3.3
|
||||||
Source0: %{url}/archive/%{name}/master/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Release: 6%{?dist}
|
||||||
|
Summary: GUI-abstraction library
|
||||||
|
|
||||||
BuildRequires: boost-devel
|
License: (LGPLv2 or LGPLv3) and MIT
|
||||||
BuildRequires: cmake >= 2.8
|
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
|
||||||
|
|
||||||
%{?!no_ui_dep:Requires: yui-ui%{?_isa} == %{major_so_ver}}
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: boost-devel
|
||||||
|
BuildRequires: cmake
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This is the user interface engine that provides the abstraction
|
This is the user interface engine that provides the abstraction
|
||||||
@ -40,14 +40,10 @@ independently of YaST for generic (C++) applications.
|
|||||||
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Files needed for developing with %{name}
|
Summary: Files needed for developing with %{name}
|
||||||
|
|
||||||
Requires: boost-devel%{?_isa}
|
Requires: boost-devel%{?_isa}
|
||||||
Requires: %{name}%{?_isa} == %{version}-%{release}
|
Requires: %{name}%{?_isa} == %{version}-%{release}
|
||||||
|
|
||||||
%if 0%{?fedora} && 0%{?fedora} <= 22
|
|
||||||
Obsoletes: %{name}-devel-common <= %{version}-%{release}
|
|
||||||
%endif #0%{?fedora} && 0%{?fedora} <= 22
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
%{name} can be used independently of YaST for generic (C++)
|
%{name} can be used independently of YaST for generic (C++)
|
||||||
@ -55,12 +51,12 @@ applications and has very few dependencies.
|
|||||||
|
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Documentation files for %{name}
|
Summary: Documentation files for %{name}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: hardlink
|
BuildRequires: hardlink
|
||||||
|
|
||||||
%description doc
|
%description doc
|
||||||
This package includes the developer's documentation and some
|
This package includes the developer's documentation and some
|
||||||
@ -68,7 +64,7 @@ brief examples how to build a UI using %{name}.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %{name}-%{name}-master-%{version}
|
%autosetup -p 1
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
|
|
||||||
|
|
||||||
@ -80,10 +76,11 @@ pushd %{_cmake_build_subdir}
|
|||||||
-DLIB_DIR=%{_libdir} \
|
-DLIB_DIR=%{_libdir} \
|
||||||
-DCMAKE_BUILD_TYPE=RELEASE \
|
-DCMAKE_BUILD_TYPE=RELEASE \
|
||||||
-DRESPECT_FLAGS=ON \
|
-DRESPECT_FLAGS=ON \
|
||||||
|
-DSKIP_LATEX=ON \
|
||||||
..
|
..
|
||||||
|
|
||||||
%{__make} %{?_smp_mflags}
|
%make_build
|
||||||
%{__make} %{?_smp_mflags} docs
|
%make_build docs
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
@ -94,24 +91,33 @@ pushd %{_cmake_build_subdir}
|
|||||||
|
|
||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
|
# Create a macro for use in other spec-files.
|
||||||
|
%{__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}
|
||||||
|
%_%{name}_plugindir %%{_libdir}/%{libsuffix}
|
||||||
|
%_%{name}_themedir %%{_datadir}/%{name}/theme
|
||||||
|
EOF
|
||||||
|
|
||||||
# Delete obsolete files.
|
# Delete obsolete files.
|
||||||
%{__rm} -rf %{buildroot}%{_defaultdocdir} \
|
%{__rm} -rf %{buildroot}%{_defaultdocdir} \
|
||||||
../examples/CMake* \
|
../examples/{CMake*,.gitignore} \
|
||||||
doc/html/*.m*
|
doc/html/*.m*
|
||||||
|
|
||||||
# Hard-link documentation.
|
|
||||||
%{_sbindir}/hardlink -cv doc/html
|
|
||||||
|
|
||||||
# Install documentation.
|
# Install documentation.
|
||||||
%{__mkdir} -p %{buildroot}%{?_pkgdocdir}
|
%{__mkdir} -p %{buildroot}%{?_pkgdocdir}
|
||||||
%{__cp} -a ../ChangeLog ../COPYING* \
|
%{__cp} -a ../README.md ../package/libyui.changes \
|
||||||
../examples/ doc/html/ \
|
../examples/ doc/html/ \
|
||||||
%{buildroot}%{?_pkgdocdir}
|
%{buildroot}%{?_pkgdocdir}
|
||||||
|
|
||||||
|
# Hard-link documentation.
|
||||||
|
%{_sbindir}/hardlink -cv %{buildroot}%{?_pkgdocdir}/html
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%ldconfig_scriptlets
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -119,22 +125,158 @@ popd
|
|||||||
%dir %{_datadir}/%{name}/theme
|
%dir %{_datadir}/%{name}/theme
|
||||||
%dir %{_libdir}/%{libsuffix}
|
%dir %{_libdir}/%{libsuffix}
|
||||||
%doc %dir %{?_pkgdocdir}
|
%doc %dir %{?_pkgdocdir}
|
||||||
%doc %{?_pkgdocdir}/COPYING*
|
%doc %{?_pkgdocdir}/README.md
|
||||||
|
%license COPYING*
|
||||||
%{_libdir}/%{name}.so.%{major_so_ver}*
|
%{_libdir}/%{name}.so.%{major_so_ver}*
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc %{?_pkgdocdir}/ChangeLog
|
%doc %dir %{?_pkgdocdir}
|
||||||
|
%doc %{?_pkgdocdir}/%{name}.changes
|
||||||
%{_datadir}/%{name}/buildtools
|
%{_datadir}/%{name}/buildtools
|
||||||
%{_includedir}/%{libsuffix}
|
%{_includedir}/%{libsuffix}
|
||||||
%{_libdir}/%{name}.so
|
%{_libdir}/%{name}.so
|
||||||
%{_libdir}/pkgconfig/%{name}.pc
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
%{_libdir}/cmake
|
%{_libdir}/cmake/%{name}
|
||||||
|
%{macrosdir}/macros.%{name}
|
||||||
|
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
|
# Pickup license-files from main-pkg's license-dir
|
||||||
|
# If there's no license-dir they are picked up by %%doc previously
|
||||||
|
%{?_licensedir:%license %{_datadir}/licenses/%{name}*}
|
||||||
%doc %{?_pkgdocdir}
|
%doc %{?_pkgdocdir}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Aug 13 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.3.3-4
|
||||||
|
- Fix gcc-8 build issue
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.3-1
|
||||||
|
- New upstream release
|
||||||
|
- Dependency on cmake-filesystem is autogenerated now
|
||||||
|
- Skip building of LaTeX-docs
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jul 30 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.2-6
|
||||||
|
- Require cmake-filesystem
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 03 2017 Jonathan Wakely <jwakely@redhat.com> - 3.3.2-4
|
||||||
|
- Rebuilt for Boost 1.64
|
||||||
|
|
||||||
|
* Sat Apr 29 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.2-3
|
||||||
|
- Rebuilt for bootstrapping new arch: s390x
|
||||||
|
|
||||||
|
* Sun Apr 23 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.2-2
|
||||||
|
- Fix macros-file
|
||||||
|
|
||||||
|
* Tue Apr 18 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.2-1
|
||||||
|
- New upstream release
|
||||||
|
- Drop patches, merged upstream
|
||||||
|
- Improve macros-file
|
||||||
|
|
||||||
|
* Sun Apr 16 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.1-6
|
||||||
|
- Updated patch
|
||||||
|
|
||||||
|
* Sat Apr 15 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.1-5
|
||||||
|
- Updated patches
|
||||||
|
|
||||||
|
* Fri Apr 14 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.1-4
|
||||||
|
- Add README.md to %%doc
|
||||||
|
|
||||||
|
* Fri Apr 14 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.1-3
|
||||||
|
- Updated patches
|
||||||
|
- Add some rpm-macros to macros-file
|
||||||
|
|
||||||
|
* Fri Apr 14 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.1-2
|
||||||
|
- Add patches adding some improvements
|
||||||
|
|
||||||
|
* Thu Apr 13 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Apr 13 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.0-1
|
||||||
|
- New upstream release
|
||||||
|
- Spec-file cosmetics
|
||||||
|
|
||||||
|
* Tue Apr 11 2017 Björn Esser <besser82@fedoraproject.org> - 3.2.9-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Apr 10 2017 Björn Esser <besser82@fedoraproject.org> - 3.2.8-4
|
||||||
|
- Use rich-dependencies instead of virtual provides
|
||||||
|
- Add macro to share major so-ver with libyui-*-packages
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 3.2.8-2
|
||||||
|
- Rebuilt for Boost 1.63
|
||||||
|
|
||||||
|
* Fri Nov 18 2016 Christian Dersch <lupinix@mailbox.org> - 3.2.8-1
|
||||||
|
- new version
|
||||||
|
|
||||||
|
* Wed Mar 30 2016 Björn Esser <fedora@besser82.io> - 3.2.5-1
|
||||||
|
- new upstream release
|
||||||
|
- drop Patch0, applied in upstream tarball
|
||||||
|
|
||||||
|
* Wed Mar 30 2016 Björn Esser <fedora@besser82.io> - 3.2.4-2
|
||||||
|
- add Patch0, fix nullptr-checks with GCC6 in YDialog
|
||||||
|
- do not append '-fno-delete-null-pointer-checks' to %%optflags,
|
||||||
|
keeping optimized performance
|
||||||
|
|
||||||
|
* Tue Mar 29 2016 Björn Esser <fedora@besser82.io> - 3.2.4-1
|
||||||
|
- new upstream release
|
||||||
|
- drop Patch1, applied in upstream tarball
|
||||||
|
- keep nullptr-checks with GCC6
|
||||||
|
- handle %%license and %%doc properly
|
||||||
|
|
||||||
|
* Wed Feb 10 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.2.1-5
|
||||||
|
- Add 0001-Fixed-a-compilation-error-in-YTableCell-with-GCC-6-b.patch
|
||||||
|
(Fix F24FTBFS)
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 3.2.1-3
|
||||||
|
- Rebuilt for Boost 1.60
|
||||||
|
|
||||||
|
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.2.1-2
|
||||||
|
- Rebuilt for Boost 1.59
|
||||||
|
|
||||||
|
* Thu Aug 27 2015 Björn Esser <bjoern.esser@gmail.com> - 3.2.1-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Thu Aug 27 2015 Björn Esser <bjoern.esser@gmail.com> - 3.2.1-0.1
|
||||||
|
- bootstrapping for so-name-bump
|
||||||
|
|
||||||
|
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.5-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||||
|
|
||||||
|
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 3.1.5-5
|
||||||
|
- rebuild for Boost 1.58
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.5-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun May 03 2015 Kalev Lember <kalevlember@gmail.com> - 3.1.5-3
|
||||||
|
- Rebuilt for GCC 5 C++11 ABI change
|
||||||
|
|
||||||
* Mon Jan 26 2015 Petr Machata <pmachata@redhat.com> - 3.1.5-2
|
* Mon Jan 26 2015 Petr Machata <pmachata@redhat.com> - 3.1.5-2
|
||||||
- Rebuild for boost 1.57.0
|
- Rebuild for boost 1.57.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user