Updating to version 2.0.1
- New recipes - Bugfixes that may or may not be logged upstream, - Improved recipe creation logic - SQL backend option
This commit is contained in:
parent
0f19c2dfad
commit
407a99b709
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1,3 @@
|
|||||||
/brewtarget_1.2.5.orig.tar.gz
|
/brewtarget_1.2.5.orig.tar.gz
|
||||||
|
/brewtarget_2.0.1.orig.tar.gz
|
||||||
|
/0001-unversioned-docdirs.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
|
|
@ -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}" )
|
|
@ -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));
|
|
@ -1,24 +1,20 @@
|
|||||||
Name: brewtarget
|
Name: brewtarget
|
||||||
Version: 1.2.5
|
Version: 2.0.1
|
||||||
Release: 6%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: An open source beer recipe creation tool
|
Summary: An open source beer recipe creation tool
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
License: GPLv3 and WTFPL and LGPLv2
|
License: GPLv3 and WTFPL and LGPLv2
|
||||||
URL: http://www.brewtarget.org
|
URL: http://www.brewtarget.org
|
||||||
Source0: http://sourceforge.net/projects/brewtarget/files/brewtarget/1.2/%{version}/brewtarget_%{version}.orig.tar.gz
|
Source0: https://launchpad.net/brewtarget/trunk/%{version}/+download/brewtarget_%{version}.orig.tar.gz
|
||||||
|
%if 0%{?fedora} && 0%{?fedora} >= 20
|
||||||
# Reported upstream at https://sourceforge.net/tracker/?func=detail&aid=3586479&group_id=249733&atid=1126483
|
Patch0: https://gitorious.org/~immanetize/brewtarget/immanetizes-brewtarget-redhat-packaging/blobs/raw/master/0001-unversioned-docdirs.patch
|
||||||
Patch0: brewtarget.desktopsemicolon.patch
|
%endif
|
||||||
# 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
|
BuildRequires: cmake
|
||||||
BuildRequires: qt-devel
|
BuildRequires: qt-devel
|
||||||
BuildRequires: qt-webkit-devel
|
BuildRequires: qt-webkit-devel
|
||||||
BuildRequires: phonon-devel
|
BuildRequires: phonon-devel
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
|
BuildRequires: sqlite
|
||||||
%description
|
%description
|
||||||
Brewtarget is an open source beer recipe creation tool. It automatically
|
Brewtarget is an open source beer recipe creation tool. It automatically
|
||||||
calculates color, bitterness, and other parameters for you while you drag and
|
calculates color, bitterness, and other parameters for you while you drag and
|
||||||
@ -28,9 +24,11 @@ It also can export and import recipes in BeerXML.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%if 0%{?fedora} && 0%{?fedora} >= 20
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%endif
|
||||||
%patch2 -p1
|
#%patch1 -p1
|
||||||
|
#%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake -DDO_RELEASE_BUILD:BOOL=ON
|
%cmake -DDO_RELEASE_BUILD:BOOL=ON
|
||||||
@ -53,6 +51,11 @@ desktop-file-validate %buildroot%{_datadir}/applications/%{name}.desktop
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* 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
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user