rpms/gnofract4d/FC-4 .cvsignore, 1.3, 1.4 gnofract4d.spec, 1.6, 1.7 sources, 1.3, 1.4

[Michael J Knox (mjk)]

Author: mjk

Update of /cvs/extras/rpms/gnofract4d/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/FC-4

Modified Files:
	.cvsignore gnofract4d.spec sources 
Log Message:
taking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 22:41:14 -0000	1.3
+++ .cvsignore	20 May 2006 20:49:07 -0000	1.4
@@ -1 +1 @@
-gnofract4d-2.6.tar.gz
+gnofract4d-2.14.tar.gz


Index: gnofract4d.spec
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/FC-4/gnofract4d.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnofract4d.spec	6 Apr 2005 22:11:38 -0000	1.6
+++ gnofract4d.spec	20 May 2006 20:49:07 -0000	1.7
@@ -1,20 +1,19 @@
 Name:           gnofract4d
-Version:        2.6
-Release:        3
-
-Summary:        Gnofract 4D is a Gnome-based program to draw fractals.
-
+Version:        2.14
+Release:        1%{?dist}
+Summary:        Gnofract 4D is a Gnome-based program to draw fractals
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://gnofract4d.sourceforge.net/
 Source0:        http//dl.sf.net/gnofract4d/gnofract4d-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: scrollkeeper, python, gcc-c++, pkgconfig
+BuildRequires: gtk2-devel, python-devel
+BuildRequires: desktop-file-utils, GConf2-devel
+
 Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
-# This *really* requires gcc at runtime!
-Requires:       gcc
-BuildRequires:  desktop-file-utils, python-devel
-BuildRequires:  scrollkeeper, libgnomeui-devel
 
 %description
 Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from
@@ -24,6 +23,7 @@
 the two sets and explore their inter-relationships.
 
 %prep
+
 %setup -q
 %ifarch x86_64
   sed -i 's|/usr/lib/|%{_libdir}/|g' setup.cfg
@@ -33,47 +33,43 @@
 python setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-#sed -i "s/Terminal=0/Terminal=false/" %{name}.desktop
-python setup.py install -O1 --root=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
-
-
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-		     --vendor fedora \
-		     --add-category X-Fedora \
-		     --add-category Graphics \
-		     --add-category Application \
-		     --delete-original \
-		     $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Graphics/gnofract4d.desktop
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome/apps
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+python setup.py install --root="%{buildroot}"
 
+%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+desktop-file-install --vendor fedora                            \
+	--delete-original                                       \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --add-category X-Fedora                                 \
+        %{buildroot}%{_datadir}/gnofract4d/gnofract4d.desktop
 
 %post
-/usr/bin/scrollkeeper-update 2> /dev/null
-/usr/bin/update-desktop-database %{_datadir}/applications
+scrollkeeper-update -q || :
 
 %postun
-/usr/bin/scrollkeeper-update 2> /dev/null
-/usr/bin/update-desktop-database %{_datadir}/applications
+scrollkeeper-update -q || :
+
+%clean
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING
-%{_bindir}/*
-%{_libdir}/%{name}-%{version}
-%{_datadir}/maps
-%{_datadir}/formulas
-%{_datadir}/gnome/help/%{name}
-%{_datadir}/pixmaps/%{name}
-%{_datadir}/applications/*
+%defattr(-, root, root, 0755)
+%doc COPYING README
+%doc %{_datadir}/gnome/help/gnofract4d/
+%{_bindir}/gnofract4d
+%dir %{_datadir}/maps/
+%{_datadir}/maps/gnofract4d/
+%{_datadir}/mime/packages/gnofract4d-mime.xml
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/gnofract4d/
+%{_datadir}/pixmaps/gnofract4d-logo.png
+%{_prefix}/lib/gnofract4d-%{version}/
+%{_datadir}/formulas/gnofract4d/
 
 %changelog
+* Wed May 17 2006 Michael J. Knox <michael[AT]Knox.net.nz> - 2.14-1
+- version bump and spec clean
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnofract4d/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 22:41:14 -0000	1.3
+++ sources	20 May 2006 20:49:07 -0000	1.4
@@ -1 +1 @@
-4fb185f967003ecd6c752cbd2b89961f  gnofract4d-2.6.tar.gz
+34170bb139eb30dfd7d1c1bc647d2578  gnofract4d-2.14.tar.gz