Update to 3.0.2 (RHBZ#2134223)

- Update dependencies
- Update and clarify licenses
- Use %forgemeta and %autochangelog
- Replace BR cmake with gcc-c++
This commit is contained in:
Sandro 2022-10-28 18:35:36 +02:00
parent 84e6b54489
commit 092c58b7f0
3 changed files with 52 additions and 142 deletions

9
.gitignore vendored
View File

@ -1,6 +1,3 @@
/brewtarget_1.2.5.orig.tar.gz
/brewtarget_2.0.1.orig.tar.gz
/0001-unversioned-docdirs.patch
/brewtarget_2.0.2.orig.tar.gz
/bc8af30bbbfa184c6c6a1f5ce090a74da7fb8c57.tar.gz
/v2.1.0.tar.gz
results_brewtarget/
brewtarget*.tar.gz
brewtarget*src.rpm

View File

@ -1,156 +1,69 @@
# force out-of-tree build for spec compatibility with older releases
%undefine __cmake_in_source_build
Name: brewtarget
Version: 2.1.0
Release: 20%{?dist}
Summary: An open source beer recipe creation tool
License: GPLv3 and WTFPL and LGPLv2
URL: http://www.brewtarget.org
Source0: https://github.com/Brewtarget/brewtarget/archive/v%{version}.tar.gz
BuildRequires: cmake
BuildRequires: qt-devel
BuildRequires: qt-webkit-devel
BuildRequires: phonon-devel
BuildRequires: desktop-file-utils
Requires: sqlite
%global forgeurl https://github.com/Brewtarget/brewtarget
%global tag v3.0.2
%forgemeta
%description
Brewtarget is an open source beer recipe creation tool. It automatically
calculates color, bitterness, and other parameters for you while you drag and
drop ingredients into the recipe. Brewtarget also has many other tools such as
priming sugar calculators, OG correction help, and a unique mash designing tool.
It also can export and import recipes in BeerXML.
%global _description %{expand:
Brewtarget is an open source beer recipe creation tool. It automatically
calculates color, bitterness, and other parameters for you while you drag and
drop ingredients into the recipe. Brewtarget also has many other tools such as
priming sugar calculators, OG correction help, and a unique mash designing tool.
It also can export and import recipes in BeerXML.}
Name: brewtarget
Version: 3.0.2
Release: 1%{?dist}
Summary: An open source beer recipe creation tool 🍺
# BSD-2-Clause: cmake/modules/FindPhonon.cmake
# WTFPL: images/flag* images/bubbles.svg images/convert.svg images/grain2glass.svg
# CC-BY-SA-3.0 OR LGPL-3.0-only: images/edit-copy.png images/document-print-preview.png
# images/merge.png images/preferences-other.png images/printer.png
# images/server-database.png images/kbruch.png images/help-contents.png
# LGPL-2.1-only: images/backup.png
License: GPL-3.0-or-later AND BSD-2-Clause AND WTFPL AND (CC-BY-SA-3.0 OR LGPL-3.0-only) AND LGPL-2.1-only
URL: %{forgeurl}
Source0: %{forgesource}
BuildRequires: gcc-c++
BuildRequires: qt5-qtbase-devel, qt5-qtwebkit-devel, qt5-qtsvg-devel
BuildRequires: qt5-qtmultimedia-devel, qt5-linguist
BuildRequires: boost-devel, xerces-c-devel, xalan-c-devel
BuildRequires: desktop-file-utils
Requires: sqlite
%description %_description
%prep
%setup -q -n %{name}-%{version}
%build
%cmake -DDO_RELEASE_BUILD:BOOL=ON
%cmake -DDO_RELEASE_BUILD:BOOL=ON
%cmake_build
%install
%cmake_install
/usr/bin/install -m 0644 -Dp doc/brewtarget.1 %buildroot%{_mandir}/man1/brewtarget.1
# Remove generated files. We use what's provided in tarball.
rm %buildroot/%{_docdir}/%{name}/{RelaseNotes.markdown,changelog.Debian.gz,copyright}
gzip doc/brewtarget.1
/usr/bin/install -m 0644 -Dp doc/brewtarget.1.gz %buildroot%{_mandir}/man1/brewtarget.1.gz
# symlink manual, which is accessible in application
rm %buildroot/%{_datadir}/%{name}/manual-en.pdf
pushd %buildroot/%{_datadir}/%{name}
ln -s ../doc/%{name}/manual-en.pdf .
popd
%check
desktop-file-validate %buildroot%{_datadir}/applications/%{name}.desktop
desktop-file-validate %buildroot%{_datadir}/%{name}/applications/%{name}.desktop
%files
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}*
%{_mandir}/man1/brewtarget.1*
%doc CHANGES.markdown README.markdown COPYRIGHT COPYING.GPLv3 COPYING.WTFPL doc/brewtarget-manual.html
%{_mandir}/man1/brewtarget*
%doc CHANGES.markdown README.markdown doc/manual-en.pdf
%license COPYRIGHT COPYING.GPLv3 COPYING.WTFPL
%changelog
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-16
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Sep 16 2019 Kevin Fenzi <kevin@scrye.com> - 2.1.0-13
- Fix FTBFS bug #1734987
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.1.0-2
- Rebuilt for GCC 5 C++11 ABI change
* Wed Nov 12 2014 Pete Travis <me@petetravis.com> - 2.1.0-2
- Update to upstream 2.1.0
- Adds inventory tracking for ingredients
- Folders for organizing recipes
- Recipe parameter sliders
- Various bugfixes, ref http://www.brewtarget.org/changelog.html
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon Feb 17 2014 Pete Travis <immanetize@fedoraproject.org> - 2.0.2-1
- Update to version 2.0.2
- Mostly a bugfix release, see http://www.brewtarget.org/changelog.html
* Sat Aug 03 2013 Pete Travis <immanetize@fedoraproject.org> - 2.0.1-2
- Update to version 2.0.1
- Removing patches where integrated upstream
- patch for unversioned docdirs on Fedora releases >= 20
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Nov 18 2012 Pete Travis <immanetize@fedoraproject.org> 1.2.3-4
- Fixing permissions on manpage
* Sat Nov 17 2012 Pete Travis <immanetize@fedoraproject.org> 1.2.5-3
- Including bundled manpage, updating SPEC
* Fri Nov 16 2012 Pete Travis <immanetize@fedoraproject.org> 1.2.5-2
- Changes to SPEC file per packaging guidelines.
* Mon Nov 12 2012 Pete Travis <immanetize@fedoraproject.org> 1.2.5-1
- Initial build of 1.2.5 release
* Mon Nov 12 2012 Pete Travis <immanetize@fedoraproject.org> 1.2.5-1
- Added patch to correct .desktop file
* Mon Nov 12 2012 Pete Travis <immanetize@fedoraproject.org> 1.2.5-1
- Added patch to install documentation to appropriate directory
* Mon Nov 12 2012 Pete Travis <immanetize@fedoraproject.org> 1.2.5-1
- Patching to warn if no documentation instead of exit.
%autochangelog

View File

@ -1 +1 @@
SHA512 (v2.1.0.tar.gz) = f40d0db5c70e8bba180b462ab560310ba99b9adb5485a6af754a7801b56a4191803fe2891efc94b089959240b72376e95e5a334a958ba345f7b264870a4b9265
SHA512 (brewtarget-3.0.2.tar.gz) = 0fca2344d1f837ad873878d05bc79f89ce92908dd7f57b523e780cb11599ba32da36017ee4e6c46d5f3258f42e9028ad3c66b72f6895c4ca9f792466e2b31229