rpms/krecipes/devel krecipes-0.9.1-gcc43.patch, NONE, 1.1 krecipes-X11.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 krecipes.spec, 1.15, 1.16 sources, 1.6, 1.7
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Mar 31 16:53:40 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7869
Modified Files:
.cvsignore krecipes.spec sources
Added Files:
krecipes-0.9.1-gcc43.patch krecipes-X11.patch
Log Message:
* Mon Mar 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.1-9
- gcc43 patch (#433986)
- BR: gettext
- --without-mysql --without-postgresql
krecipes-0.9.1-gcc43.patch:
--- NEW FILE krecipes-0.9.1-gcc43.patch ---
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;
};
krecipes-X11.patch:
--- NEW FILE krecipes-X11.patch ---
--- 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 Dec 2005 12:49:33 -0000 1.6
+++ .cvsignore 31 Mar 2008 16:52:58 -0000 1.7
@@ -1,2 +1 @@
krecipes-0.9.1.tar.gz
-krecipes-X11.patch
Index: krecipes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- krecipes.spec 13 Mar 2008 15:47:31 -0000 1.15
+++ krecipes.spec 31 Mar 2008 16:52:58 -0000 1.16
@@ -1,6 +1,6 @@
Name: krecipes
Version: 0.9.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Application to manage recipes and shopping-lists
Group: Applications/Productivity
@@ -9,10 +9,14 @@
Source0: http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdelibs3-devel , sqlite-devel, desktop-file-utils, libacl-devel
-
-patch0: krecipes-gcc4.patch
-patch1: krecipes-X11.patch
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: kdelibs3-devel
+BuildRequires: sqlite-devel
+
+Patch0: krecipes-gcc4.patch
+Patch1: krecipes-X11.patch
+Patch2: krecipes-0.9.1-gcc43.patch
%description
Krecipes is a program that lets you to manage your recipes, create
@@ -22,17 +26,25 @@
%prep
%setup -q
-%patch0 -p1 -b .gcc4
+
+## Neither patch0 or patch1 should be required anymore -- Rex
+#patch0 -p1 -b .gcc4
# 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
+#patch1 -p1 -b .X11
+
+%patch2 -p1 -b .gcc43
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath
+
+%configure \
+ --disable-rpath \
+ --without-mysql \
+ --without-postgresql
+
make %{?_smp_mflags}
@@ -43,13 +55,13 @@
desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--vendor=fedora \
---add-category=X-Fedora \
--add-category=Application \
--add-category=Utility \
--add-category=KDE \
--add-category=Qt \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop
+
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
@@ -85,6 +97,11 @@
%{_datadir}/mimelnk/*/*.desktop
%changelog
+* Mon Mar 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.1-9
+- gcc43 patch (#433986)
+- BR: gettext
+- --without-mysql --without-postgresql
+
* Thu Mar 13 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.1-8
- fix BuildRequires
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 5 Dec 2005 12:49:33 -0000 1.6
+++ sources 31 Mar 2008 16:52:58 -0000 1.7
@@ -1,2 +1 @@
7414fd5210561801ba04ee3dad6561d9 krecipes-0.9.1.tar.gz
-67e68fc70f7ff67235a7a36affa7af6d krecipes-X11.patch
More information about the fedora-extras-commits
mailing list