diff --git a/.cvsignore b/.cvsignore index fafabee..f5482f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -krecipes-0.9.1.tar.gz +krecipes-1.0-beta2.tar.gz diff --git a/krecipes-0.9.1-gcc43.patch b/krecipes-0.9.1-gcc43.patch deleted file mode 100644 index f55d7d6..0000000 --- a/krecipes-0.9.1-gcc43.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up krecipes-0.9.1/krecipes/src/importers/kreimporter.h.gcc43 krecipes-0.9.1/krecipes/src/importers/kreimporter.h ---- krecipes-0.9.1/krecipes/src/importers/kreimporter.h.gcc43 2005-12-03 15:33:56.000000000 -0600 -+++ krecipes-0.9.1/krecipes/src/importers/kreimporter.h 2008-03-31 11:36:53.000000000 -0500 -@@ -46,7 +46,7 @@ private: - void readCategoryStructure( const QDomNodeList& l, CategoryTree *tree ); - void readDescription( const QDomNodeList& l, Recipe* ); - void readIngredients( const QDomNodeList& l, Recipe*, const QString &header = QString::null ); -- void readAmount( const QDomElement& amount, double &amount, double &amount_offset ); -+ void readAmount( const QDomElement& amount, double &amount2, double &amount_offset ); - void readRatings( const QDomNodeList&, Recipe * ); - void readCriterion( const QDomNodeList&, RatingCriteriaList &r ); - }; -diff -up krecipes-0.9.1/krecipes/src/importers/recipemlimporter.h.gcc43 krecipes-0.9.1/krecipes/src/importers/recipemlimporter.h ---- krecipes-0.9.1/krecipes/src/importers/recipemlimporter.h.gcc43 2005-12-03 15:33:56.000000000 -0600 -+++ krecipes-0.9.1/krecipes/src/importers/recipemlimporter.h 2008-03-31 11:36:23.000000000 -0500 -@@ -45,7 +45,7 @@ private: - void readRecipemlRecipe( const QDomElement& recipe ); - void readRecipemlPreptime( const QDomElement &preptime ); - void readRecipemlQty( const QDomElement &qty, Ingredient &ing ); -- void readRecipemlRange( const QDomElement& range, double &range, double &range_offset ); -+ void readRecipemlRange( const QDomElement& range, double &range2, double &range_offset ); - - Recipe recipe; - }; diff --git a/krecipes-X11.patch b/krecipes-X11.patch deleted file mode 100644 index b390dce..0000000 --- a/krecipes-X11.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- krecipes-0.9-orig/configure 2005-11-29 16:40:35.000000000 -0600 -+++ krecipes-0.9/configure 2005-12-03 22:18:40.000000000 -0600 -@@ -27972,7 +27972,7 @@ - - if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. -- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -+ test -z "$x_direct_test_include" && x_direct_test_include=X11/Xlib.h - - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -@@ -28057,7 +28057,7 @@ - if test "$ac_x_libraries" = NO; then - # Check for the libraries. - -- test -z "$x_direct_test_library" && x_direct_test_library=Xt -+ test -z "$x_direct_test_library" && x_direct_test_library=X11 - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. diff --git a/krecipes.spec b/krecipes.spec index 4a16728..680ba02 100644 --- a/krecipes.spec +++ b/krecipes.spec @@ -1,12 +1,12 @@ Name: krecipes -Version: 0.9.1 -Release: 12%{?dist} +Version: 1.0 +Release: 0.1.beta2%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity License: GPLv2+ URL: http://krecipes.sourceforge.net/ -Source0: http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz +Source0: http://download.sourceforge.net/krecipes/krecipes-%{version}-beta2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -16,9 +16,6 @@ BuildRequires: sqlite-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel -Patch1: krecipes-X11.patch -Patch2: krecipes-0.9.1-gcc43.patch - %description Krecipes is a program that lets you to manage your recipes, create shopping lists, choose a recipe based on available ingredients and plan @@ -26,15 +23,7 @@ your menu/diet in advance. %prep -%setup -q - -# autoconf tools check for X is a file in libXt-devel and Xt lib -# we dont use or link against libXt so rather than adding an extra -# BuildRequires I patched configure to look for something thats there -%patch1 -p1 -b .X11 - -%patch2 -p1 -b .gcc43 - +%setup -q -n %{name}-%{version}-beta2 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -97,6 +86,10 @@ touch --no-create %{_datadir}/icons/crystalsvg || : %{_datadir}/mimelnk/*/*.desktop %changelog +* Mon Aug 17 2009 Toshio Kuratomi - 1.0-0.1.beta2 +- Update to 1.0beta2 as it fixes a crash that prevents krecipes from starting + with sqlite backend. + * Fri Jul 24 2009 Fedora Release Engineering - 0.9.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 215b01e..23dd155 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7414fd5210561801ba04ee3dad6561d9 krecipes-0.9.1.tar.gz +ad02ed6225cff51d8688cf4ab16bd82f krecipes-1.0-beta2.tar.gz