[mapnik] Add proj-devel to devel package requires. Drop ancient fedora 11 conditionals

[Peter Robinson]

commit 500383ad2f2106b138dd95aa9bcaf047ec09fbdc
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Dec 23 12:14:00 2011 +0000

    Add proj-devel to devel package requires. Drop ancient fedora 11 conditionals

 mapnik.spec |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/mapnik.spec b/mapnik.spec
index 9d46834..2f66651 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -10,16 +10,10 @@ Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
 Patch0:	   mapnik-2.0.0-build-viewer.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?fedora} >= 11
-Requires:  dejavu-serif-fonts dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-lgc-serif-fonts dejavu-lgc-sans-fonts dejavu-lgc-sans-mono-fonts
-%else
-Requires:  dejavu-fonts
-%endif
+Requires: dejavu-serif-fonts dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-lgc-serif-fonts dejavu-lgc-sans-fonts dejavu-lgc-sans-mono-fonts
 Requires: proj-epsg
 
-
 BuildRequires: postgresql-devel pkgconfig
 BuildRequires: gdal-devel proj-devel agg-devel
 BuildRequires: scons desktop-file-utils gcc-c++
@@ -51,7 +45,8 @@ industry standard libraries from boost.org
 Summary: Mapnik is a Free toolkit for developing mapping applications
 Group: Development/Tools
 Requires: %{name} = %{version}-%{release}
-Requires: libpng-devel libjpeg-devel freetype-devel agg-devel
+Requires: libpng-devel libjpeg-devel freetype-devel
+Requires: agg-devel proj-devel
 
 %description devel
 Mapnik is a Free Toolkit for developing mapping applications.
@@ -172,8 +167,6 @@ popd
 
 %install
 
-rm -rf %{buildroot}
-
 scons install DESTDIR=%{buildroot} \
               PREFIX=%{_prefix} \
               THREADING=multi \
@@ -227,9 +220,6 @@ pushd tests/python_tests/
 ./render_test.py || true
 popd
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -271,6 +261,10 @@ rm -rf %{buildroot}
 %doc demo/python demo/test
 
 %changelog
+* Fri Dec 23 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 2.0.0-2
+- Add proj-devel to devel package requires
+- Drop ancient fedora 11 conditionals
+
 * Tue Nov 22 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.0-1
 - Update to upstream 2.0.0
 - Namespace is "mapnik2".