rpms/gazpacho/devel .cvsignore, 1.7, 1.8 gazpacho.spec, 1.12, 1.13 sources, 1.7, 1.8

[Konstantin Ryabitsev (icon)]

Author: icon

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

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Aug 2005 17:45:53 -0000	1.7
+++ .cvsignore	29 Oct 2005 22:55:41 -0000	1.8
@@ -1 +1,2 @@
-gazpacho-0.6.1.tar.bz2
+gazpacho-0.6.2.tar.bz2
+gazpacho-0.6.1-nox.patch


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gazpacho.spec	19 Aug 2005 17:45:53 -0000	1.12
+++ gazpacho.spec	29 Oct 2005 22:55:41 -0000	1.13
@@ -1,63 +1,86 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Summary: Glade Interface Creator
-Name: gazpacho
-Version: 0.6.1
-Release: 1%{?dist}
-License: GPL
-Group: Development/Tools
-URL: http://gazpacho.sicem.biz/
-Provides: Gazpacho = %{version}-%{release}
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/gazpacho-%{version}.tar.bz2
-Patch0: gazpacho-0.6.1-nox.patch
-# already upstream, remove for next release
-Patch1: gazpacho-0.6.1-installroot.patch 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: noarch
-Requires: pygtk2 >= 2.4.0, pygtk2-libglade
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-
-# hrm, the brp-python-bytecompile will byte-compile docs stuff too 
-# which is probably not what we want
-%define __os_install_post \
-  [ -x /usr/lib/rpm/brp-python-bytecompile ] && /usr/lib/rpm/brp-python-bytecompile \
-  rm -f $RPM_BUILD_ROOT/%{_docdir}/gazpacho/examples/*.py[co] \
-%{nil}
-  
+Name:           gazpacho
+Version:        0.6.2
+Release:        1%{?dist}
+Summary:        Glade Interface Creator
+
+Group:          Development/Tools
+License:        GPL
+URL:            http://gazpacho.sicem.biz/
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/%{name}-%{version}.tar.bz2
+Patch0:         gazpacho-0.6.1-nox.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch:      noarch
+
+BuildRequires:  python-devel, desktop-file-utils
+Requires:       pygtk2 >= 2.4.0, pygtk2-libglade
+Requires:       python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
+
 
 %description
 This program allows you to create the Graphical User Interface (GUI) of your
 GTK+ program in a visual way. Yes, it is a Glade-3 clone. It is compatible with
 libglade.
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .nox
-%patch1 -p0
+
 
 %build
-python ./setup.py build
+%{__python} setup.py build
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT \
-  --record=INSTALLED_FILES
-sed 's|^\(.*\.pyo\)$|%ghost \1|' < INSTALLED_FILES > %{name}-%{version}.files
-find $RPM_BUILD_ROOT%{python_sitelib}/* $RPM_BUILD_ROOT%{_datadir}/%{name} -type d \
-  | sed "s|^$RPM_BUILD_ROOT|%dir |" >> %{name}-%{version}.files
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/%{_docdir}/gazpacho
+desktop-file-install \
+    --delete-original \
+    --vendor fedora \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --add-category Application \
+    --add-category Development \
+    --add-category X-Fedora \
+    $RPM_BUILD_ROOT%{_datadir}/applications/gazpacho.desktop
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-%{version}.files
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README COPYING NEWS 
-# this will go away in the next version 
-/usr/lib/gazpacho/widgets/gtk+.py[co]
-%{python_sitelib}/gazpacho/__installed__.py*
+%doc README COPYING NEWS examples/*
+%dir %{python_sitelib}/gazpacho
+%dir %{python_sitelib}/gazpacho/loader
+%dir %{python_sitelib}/gazpacho/widgets
+%dir %{python_sitelib}/gazpacho/widgets/base
+%{python_sitelib}/gazpacho/*.py
+%{python_sitelib}/gazpacho/*.pyc
+%ghost %{python_sitelib}/gazpacho/*.pyo
+%{python_sitelib}/gazpacho/*/*.py
+%{python_sitelib}/gazpacho/*/*.pyc
+%ghost %{python_sitelib}/gazpacho/*/*.pyo
+%{python_sitelib}/gazpacho/*/*/*.py
+%{python_sitelib}/gazpacho/*/*/*.pyc
+%ghost %{python_sitelib}/gazpacho/*/*/*.pyo
+%{_datadir}/gazpacho
+%{_bindir}/*
+%{_datadir}/applications/*.desktop
 
 
 %changelog
+* Sat Oct 29 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.2-1
+- Version 0.6.2
+- Conform to extras spec standards
+- List files namely, do not rely on INSTALLED_FILES
+- Use desktop-file-utils to install the .desktop file
+- Use find_lang
+
 * Fri Aug 19 2005 Jeremy Katz <katzj at redhat.com> - 0.6.1
 - update to 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Aug 2005 17:45:53 -0000	1.7
+++ sources	29 Oct 2005 22:55:41 -0000	1.8
@@ -1 +1,2 @@
-71c53c5ada604c729233ea0b0bcb731e  gazpacho-0.6.1.tar.bz2
+64311aa9688c456838903b3777703981  gazpacho-0.6.2.tar.bz2
+40f1dc10bebd7f3f06bbb53ea533bf75  gazpacho-0.6.1-nox.patch