[gnofract4d] New upstream release (fixes bz 665571, 834382, and 843224). Require glibc-devel (fixes bz 725205). F

Thu Jul 26 18:25:38 UTC 2012

commit ac8354537c630ddb93f20ecb99e50c05dc9c1990
Author: Jerry James <loganjerry at gmail.com>
Date:   Thu Jul 26 12:24:22 2012 -0600

    New upstream release (fixes bz 665571, 834382, and 843224).
    Require glibc-devel (fixes bz 725205).
    Filter provides of private Python shared objects.
    Ship the man page.
    Spec file cleanups.

 .gitignore      |    2 +-
 gnofract4d.spec |  112 +++++++++++++++++++++++++++++++------------------------
 sources         |    2 +-
 3 files changed, 65 insertions(+), 51 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e97a04b..d220823 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-gnofract4d-3.13.tar.gz
+/gnofract4d-3.14.tar.bz2
diff --git a/gnofract4d.spec b/gnofract4d.spec
index cbae32a..1113b8a 100644
--- a/gnofract4d.spec
+++ b/gnofract4d.spec
@@ -1,63 +1,73 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Name:           gnofract4d
-Version:        3.13
-Release:        5%{?dist}
+Version:        3.14
+Release:        1%{?dist}
 Summary:        Gnofract 4D is a Gnome-based program to draw fractals
 Group:          Amusements/Graphics
 License:        LGPLv2+
 URL:            http://gnofract4d.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:      gcc
-Requires:      pygtk2 >= 2.6
-# Don't need to list these, they are needed by gtk2-devel
-# pkgconfig libpng-devel
-BuildRequires: xorg-x11-xinit xorg-x11-server-Xvfb
-BuildRequires: gcc-c++
-BuildRequires: pygtk2-devel >= 2.6
-BuildRequires: gtk2-devel
-BuildRequires: GConf2-devel
-BuildRequires: python-devel >= 2.4
-BuildRequires: libjpeg-devel
-BuildRequires: desktop-file-utils
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc-c++
+BuildRequires:  GConf2-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  pygtk2-devel
+#BuildRequires:  xorg-x11-server-Xvfb
+#BuildRequires:  xorg-x11-xinit
+
+Requires:       gcc
+Requires:       libgcc%{?_isa}
+Requires:       glibc-devel%{?_isa}
+Requires:       pygtk2%{?_isa}
+
+%global __provides_exclude_from ^%{_libdir}/python.*\\.so$
 
 %description
 Gnofract 4D is a free, open source program which allows anyone to create
-beautiful images called fractals. The images are automatically created by
-the computer based on mathematical principles. These include the Mandelbrot
-and Julia sets and many more. You don't need to do any math: you can explore
-a universe of images just using a mouse.
+beautiful images called fractals.  The images are automatically created
+by the computer based on mathematical principles.  These include the
+Mandelbrot and Julia sets and many more.  You don't need to do any math:
+you can explore a universe of images just using a mouse.
 
 %prep
-
 %setup -q
 
+# Fix the desktop file
+sed -e "/Encoding/d" \
+    -e "s/logo\.png/logo/" \
+    -e "s/Categories.*/Categories=Graphics;GTK;GNOME;Education;Science;Math;/" \
+    -e "s/MimeType.*/&;/" \
+    %{name}.desktop > %{name}.desktop.new
+touch -r %{name}.desktop %{name}.desktop.new
+mv -f %{name}.desktop.new %{name}.desktop
+
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+python2 setup.py build
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
-%{__install} -d -m0755 $RPM_BUILD_ROOT%{_datadir}/applications/
-desktop-file-install --vendor fedora --delete-original \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
-# remove the shebangs
-find $RPM_BUILD_ROOT%{python_sitearch} -perm 644 -type f -name '*.py' | while read line;do
-  sed -i 's|#!/usr/bin/env python||' "$line"
-  sed -i 's|#!/usr/bin/python||' "$line"
+python2 setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
+# Check the desktop file
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+# Remove the shebangs
+for fil in `find $RPM_BUILD_ROOT%{python2_sitearch} -perm 644 -name '*.py'`; do
+  sed '\|^#!/usr/bin.*python|d' $fil > $fil.new
+  touch -r $fil $fil.new
+  mv -f $fil.new $fil
 done
 
-#remove duplicated docs
+# Remove duplicated docs
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 # Why is this map 755?
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/maps/royal.map
 
+# Install the man page
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p doc/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
 %post
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -70,26 +80,30 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 #check
 # Randomly assigns a number 10-99 to $dnum
 #let "dnum = $RANDOM % 90 + 10"
-#xinit %{__python} test.py -- /usr/bin/Xvfb :$dnum -ac
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+#xinit %%{__python} test.py -- /usr/bin/Xvfb :$dnum -ac
 
 %files
-%defattr(-,root,root,0755)
 %doc COPYING README
-%doc %{_datadir}/gnome/help/%{name}/
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/gnome/help/%{name}/
 %{_datadir}/mime/packages/%{name}-mime.xml
-%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/%{name}*
-%{python_sitearch}/*.egg-info
-%{python_sitearch}/fract4d/
-%{python_sitearch}/fract4dgui/
-%{python_sitearch}/fractutils/
+%{_mandir}/man1/%{name}*
+%{python2_sitearch}/*.egg-info
+%{python2_sitearch}/fract4d/
+%{python2_sitearch}/fract4dgui/
+%{python2_sitearch}/fractutils/
 
 %changelog
+* Thu Jul 26 2012 Jerry James <loganjerry at gmail.com> - 3.14-1
+- New upstream release (fixes bz 665571, 834382, and 843224)
+- Require glibc-devel (fixes bz 725205)
+- Filter provides of private Python shared objects
+- Ship the man page
+- Spec file cleanups
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 6fca485..6fb9a2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d739eb0a61bc518ada8f5b8952298166  gnofract4d-3.13.tar.gz
+990787e054e5ab8ac7d1ef07e79e825c  gnofract4d-3.14.tar.bz2
