rpms/gourmet/devel .cvsignore, 1.4, 1.5 gourmet.spec, 1.3, 1.4 sources, 1.4, 1.5

[Michael A. Peters (mpeters)]

Author: mpeters

Update of /cvs/extras/rpms/gourmet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30456

Modified Files:
	.cvsignore gourmet.spec sources 
Log Message:
Testing branch of gourmet (adds some cool features).
Spec file builds - but not ready for build request.
Not for fc4/fc5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gourmet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2005 23:30:17 -0000	1.4
+++ .cvsignore	18 Mar 2006 08:56:03 -0000	1.5
@@ -1,2 +1,3 @@
 gourmet-0.8.5.12.tar.gz
 gourmet-0.8.5.13.tar.gz
+gourmet-0.10.1.tar.gz


Index: gourmet.spec
===================================================================
RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gourmet.spec	11 Nov 2005 23:30:17 -0000	1.3
+++ gourmet.spec	18 Mar 2006 08:56:04 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gourmet
-Version:	0.8.5.13
+Version:	0.10.1
 Release:	1%{?dist}
 Summary:	PyGTK Recipe Manager
 
@@ -33,15 +33,31 @@
 %prep
 %setup -q
 %{__sed} -i 's?\.$??g' gourmet.desktop
+#%%{__sed} -i 's?\r??' src/lib/defaults_sk.py
+#%%{__sed} -i 's?\r??' src/lib/defaults_pt.py
+chmod -x data/recipe.dtd
 # remove *.mo files - we'll regenerate them
 pushd i18n
 find -name \*.mo |xargs rm -f
 popd
+# remove shell bangs
+pushd src/lib
+for file in `find . -type f`; do
+  cp $file $file.orig
+  if [ ! "$file" = "./nutrition/__init__.py" ]; then
+    grep -v "^\#\!\/usr\/bin" $file.orig > $file
+  fi
+  rm -f $file.orig
+done
+popd
 
 %build
 pushd i18n
 for file in *.po; do
-	sh make_mo.sh $(basename $file .po)
+  # broken .po files
+  if [ ! ${file} = "hu.po" ] && [ ! ${file} = "pt_BR.po" ]; then
+    sh make_mo.sh $(basename $file .po)
+  fi
 done
 popd
 
@@ -52,6 +68,7 @@
 %{__python} setup.py install -O1 --skip-build --root %buildroot \
 --disable-modules-check
 
+
 desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \
 --vendor=fedora \
 --add-category=X-Fedora \
@@ -59,7 +76,6 @@
 --copy-name-to-generic-name \
 --delete-original
 
-
 %find_lang %{name}
 
 %clean
@@ -92,12 +108,31 @@
 %{python_sitelib}/gourmet/importers/html_plugins/*.py
 %{python_sitelib}/gourmet/importers/html_plugins/*.pyc
 %ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo
+%dir %{python_sitelib}/gourmet/nutrition
+%{python_sitelib}/gourmet/nutrition/*.py
+%{python_sitelib}/gourmet/nutrition/*.pyc
+%ghost %{python_sitelib}/gourmet/nutrition/*.pyo
 # datadir stuff
 %{_datadir}/applications/fedora-gourmet.desktop
 %{_datadir}/pixmaps/recbox.png
 %{_datadir}/gourmet
 
 %changelog
+* Sat Mar 18 2006 Michael A. Peters <mpeters at mac.com> - 0.10.1-1
+- This is the unstable branch of gourmet - for the devel branch
+- of Fedora Extras
+-- Main new features since 0.8 stable branch:
+-- adds nutritional information
+-- uses sqlite database backend
+- TODO (packaging)
+-- broken po files (two of them)
+-- verify sqlite backend works as advertised
+-- verify updating existing recipe database works
+
+* Fri Mar 17 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-1
+- New upstream version
+- rpmlint cleanup
+
 * Fri Nov 11 2005 Michael A. Peters <mpeters at mac.com> - 0.8.5.13-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gourmet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2005 23:30:17 -0000	1.4
+++ sources	18 Mar 2006 08:56:04 -0000	1.5
@@ -1,2 +1 @@
-77b615493759a5a37a55589e7a24b9a9  gourmet-0.8.5.12.tar.gz
-3db64a0609bf5d97b81d8600dda559b9  gourmet-0.8.5.13.tar.gz
+a3e73adb21c205ba0bd6ee76ee5860c9  gourmet-0.10.1.tar.gz