rpms/fyre/devel .cvsignore, 1.2, 1.3 fyre.spec, 1.15, 1.16 sources, 1.2, 1.3 fyre-1.0.0-apps.patch, 1.1, NONE

Tue Oct 10 15:42:39 UTC 2006

Author: bpepple

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

Modified Files:
	.cvsignore fyre.spec sources 
Removed Files:
	fyre-1.0.0-apps.patch 
Log Message:
* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.1-1
- Update to 1.0.1.
- Scriptlet cleanup.
- Drop app patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	25 Mar 2005 16:33:15 -0000	1.2
+++ .cvsignore	10 Oct 2006 15:42:39 -0000	1.3
@@ -1 +1 @@
-fyre-1.0.0.tar.bz2
+fyre-1.0.1.tar.bz2


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fyre.spec	17 Sep 2006 20:45:05 -0000	1.15
+++ fyre.spec	10 Oct 2006 15:42:39 -0000	1.16
@@ -1,21 +1,31 @@
 Name:           fyre
-Version:        1.0.0
-Release:        15%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
+Summary:        Tool for creating artwork from chaotic functions
 
-Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://fyre.navi.cx/
-Source0:        http://flapjack.navi.cx/releases/fyre/fyre-1.0.0.tar.bz2
-Source1:        fyre-cluster.init
-Source2:        fyre.config
-Patch:          fyre-1.0.0-apps.patch
+Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
+Source1:        %{name}-cluster.init
+Source2:        %{name}.config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
-Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(preun): initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info
+BuildRequires:  libglade2-devel
+BuildRequires:	gnet2-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	shared-mime-info
+
+Requires(post): desktop-file-utils
+Requires(post):	shared-mime-info
+Requires(post):	/sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
+
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -24,60 +34,79 @@
 line interface for easy and efficient rendering of high-resolution, high
 quality images.
 
+
 %prep
 %setup -q
-%patch -p 1 -b .apps
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-desktop-file-install --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --add-category=GTK \
-  --delete-original \
+make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install --vendor fedora --delete-original	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
+  --add-category X-Fedora			        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/fyre-cluster
 install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/fyre
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null ||:
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
+
 %preun
 if [ $1 = 0 ]; then
- /sbin/chkconfig --del fyre-cluster
- /sbin/service fyre-cluster stop >> /dev/null
+	/sbin/service fyre-cluster stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del fyre-cluster
 fi
 
+
 %postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/*
+%{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/mimetypes/*
-%{_datadir}/mime/packages/*
-%{_datadir}/pixmaps/*
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-%{name}-animation.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/mime/packages/%{name}.xml
 %{_initrddir}/fyre-cluster
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1.
+- Scriptlet cleanup.
+- Drop app patch.
+
 * Mon Sep 18 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.0.0-15
 - rebuilt due to broken depends.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Mar 2005 16:33:15 -0000	1.2
+++ sources	10 Oct 2006 15:42:39 -0000	1.3
@@ -1 +1 @@
-5da821b3166d3de187cc7d84bb1dc4d3  fyre-1.0.0.tar.bz2
+3058bb171f76ced74f79d876f296ac6f  fyre-1.0.1.tar.bz2


--- fyre-1.0.0-apps.patch DELETED ---


