Fix borked changelog

- Add missing changelog
- Use %autorelease

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Convert tabs to spaces
+26b7473d7ee62ec423a69c766c3fff65e5a4309c

.gitignore

@@ -1 +1,3 @@
-/brewtarget_1.2.5.orig.tar.gz
+results_brewtarget/
+brewtarget*.tar.gz
+brewtarget*src.rpm

brewtarget.desktopsemicolon.patch

@@ -1,9 +0,0 @@
---- brewtarget-1.2.5/brewtarget.desktop.in.orig	2012-07-14 11:49:41.000000000 -0600
-+++ brewtarget-1.2.5/brewtarget.desktop.in	2012-11-12 18:09:36.665509887 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Categories=Qt;KDE;Education;Utility;Engineering
-+Categories=Qt;KDE;Education;Utility;Engineering;
- Exec=brewtarget
- Name=Brewtarget
- GenericName=Beer calculator

brewtarget.docdirfix.patch

@@ -1,11 +0,0 @@
---- brewtarget-1.2.5/CMakeLists.txt.orig	2012-07-14 11:49:41.000000000 -0600
-+++ brewtarget-1.2.5/CMakeLists.txt	2012-11-12 17:56:52.131360768 -0700
-@@ -139,7 +139,7 @@
- IF( UNIX AND NOT APPLE )
-   SET( DATAPATH "${DATAROOTDIR}/${CMAKE_PROJECT_NAME}" )
-   SET( TARGETPATH ${BINDIR} )
--  SET( DOCPATH ${DOCDIR} )
-+  SET( DOCPATH ${DOCDIR}-${brewtarget_VERSION_STRING} )
- ELSEIF( WIN32 )
-   # Works for regular "make install", but not CPack/NSIS installer.
-   #SET( CMAKE_INSTALL_PREFIX "C:/Program Files/brewtarget-${brewtarget_VERSION_STRING}" )

brewtarget.functionwithoutdocs.patch

@@ -1,13 +0,0 @@
---- brewtarget-1.2.5/src/brewtarget.cpp.orig	2012-11-12 23:00:51.379511289 -0700
-+++ brewtarget-1.2.5/src/brewtarget.cpp	2012-11-12 23:01:45.379472819 -0700
-@@ -112,8 +112,8 @@
-    {
-       QMessageBox::information(0,
-                                QObject::tr("Directory Problem"),
--                               QObject::tr("\"%1\" cannot be read.").arg(dir.path()));
--      return false;
-+                               QObject::tr("\"%1\" cannot be read. Manual will not be available.").arg(dir.path()));
-+      return true;
-    }
- 
-    dir.setPath(getConfigDir(&success));

brewtarget.spec

@@ -1,76 +1,69 @@
-Name:		brewtarget
+# force out-of-tree build for spec compatibility with older releases
-Version:	1.2.5
+%undefine __cmake_in_source_build
-Release:	4%{?dist}
-Summary:	An open source beer recipe creation tool
-Group:		Applications/Productivity
-License:	GPLv3 and WTFPL and LGPLv2
-URL:		http://www.brewtarget.org
-Source0:	http://sourceforge.net/projects/brewtarget/files/brewtarget/1.2/%{version}/brewtarget_%{version}.orig.tar.gz
 
-# Reported upstream at https://sourceforge.net/tracker/?func=detail&aid=3586479&group_id=249733&atid=1126483
+%global forgeurl https://github.com/Brewtarget/brewtarget
-Patch0:		brewtarget.desktopsemicolon.patch
-# Reported upstream at https://sourceforge.net/tracker/?func=detail&aid=3586539&group_id=249733&atid=1126483
-Patch1:		brewtarget.docdirfix.patch
-# emailed upstream Nov 12 2012
-Patch2:		brewtarget.functionwithoutdocs.patch
 
-BuildRequires:	cmake
+%global _description %{expand:
-BuildRequires:	qt-devel
-BuildRequires:	qt-webkit-devel
-BuildRequires:	phonon-devel
-BuildRequires:	desktop-file-utils
-%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.
+It also can export and import recipes in BeerXML.}
+
+Name:           brewtarget
+Version:        3.0.6
+Release:        %{autorelease}
+Summary:        An open source beer recipe creation tool 🍺
+%forgemeta
+# 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
+%setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %cmake -DDO_RELEASE_BUILD:BOOL=ON
-make %{?_smp_mflags} 
+%cmake_build
-
 
 %install
-make VERBOSE=1 INSTALL="install -p" CP="cp -p" DESTDIR=%{buildroot} 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
 
 %files
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/%{name}
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_mandir}/man1/brewtarget.1*
+%{_mandir}/man1/brewtarget*
-%doc README COPYRIGHT COPYING.GPLv3 COPYING.WTFPL doc/manual/index.html 
+%doc CHANGES.markdown README.markdown doc/manual-en.pdf
-
+%license COPYRIGHT COPYING.GPLv3 COPYING.WTFPL
-
 
 %changelog
-* Sun Nov 18 2012 Pete Travis <immanetize@fedoraproject.org> 1.2.3-4
+%autochangelog
-- 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.
-

changelog

@@ -0,0 +1,138 @@
+* Mon Feb 13 2023 Sandro <devel@penguinpee.nl> - 3.0.6-1
+- Update to 3.0.6 (RHBZ#2167997)
+- Add missing changelog
+- Use %autorelease
+
+* Mon Jan 16 2023 Sandro <devel@penguinpee.nl> - 3.0.5-1
+- Update to 3.0.5 (RHBZ#2156207)
+
+* Tue Nov 29 2022 Sandro <devel@penguinpee.nl> - 3.0.4-1
+- Update to 3.0.4 (RHBZ#2149053)
+- Fix desktop file location
+
+* Wed Nov 23 2022 Sandro <devel@penguinpee.nl> - 3.0.3-4
+- Drop definition of tag
+
+* Wed Nov 23 2022 Sandro <devel@penguinpee.nl> - 3.0.3-3
+- Ignore tab to space conversion
+
+* Wed Nov 23 2022 Sandro <devel@penguinpee.nl> - 3.0.3-2
+- Convert tabs to spaces
+
+* Sat Nov 12 2022 Sandro <devel@penguinpee.nl> - 3.0.3-1
+- Update to 3.0.2 (RHBZ#2140886)
+- SPDX migration
+
+* Fri Oct 28 2022 Sandro <devel@penguinpee.nl> - 3.0.2-1
+- Update to 3.0.2 (RHBZ#2134223)
+- Update dependencies
+- Update and clarify licenses
+- Use %forgemeta and %autochangelog
+- Replace BR cmake with gcc-c++
+
+* 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.

sources

@@ -1 +1 @@
-6122f2358beda23f1da4fbe2f4909b24  brewtarget_1.2.5.orig.tar.gz
+SHA512 (brewtarget-3.0.6.tar.gz) = 1bddc32338c5a90e96970154c0b21a5e911224cd8c1430824e67176ad1d69261bfa53f63829f3375598fd1a37f79f75d3e6b278f46d4179d4fc1891fd48797b4