[grantlee] 0.1.9

[Rex Dieter]

commit 67ae2b6ce0aa2cdb868c5572c5d4c39f6c46997f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jul 12 19:06:47 2011 -0500

    0.1.9

 .gitignore    |    3 +--
 grantlee.spec |   57 +++++++++++++++++++++++++++++++++++----------------------
 sources       |    2 +-
 3 files changed, 37 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16c3d4b..581efe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-grantlee-0.1.2.tar.gz
-/grantlee-0.1.5.tar.gz
 /grantlee-0.1.6.tar.gz
+/grantlee-0.1.9.tar.gz
diff --git a/grantlee.spec b/grantlee.spec
index 7459367..07d8bb3 100644
--- a/grantlee.spec
+++ b/grantlee.spec
@@ -1,10 +1,9 @@
-%define apidocs 0
 
-# apidocs disabled until we agree on a standard path.
+%define apidocs 1 
 
 Name:           grantlee
-Version:        0.1.6
-Release:        2%{?dist}
+Version:        0.1.9
+Release:        1%{?dist}
 Summary:        Qt string template engine based on the Django template system
 
 Group:          System Environment/Libraries
@@ -13,11 +12,11 @@ URL:            http://www.gitorious.org/grantlee/pages/Home
 Source0:        http://downloads.%{name}.org/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel cmake
-
+BuildRequires:  cmake
 %if 0%{?apidocs}   
 BuildRequires:  doxygen
 %endif
+BuildRequires:  qt4-devel
 
 %description
 Grantlee is a plug-in based String Template system written 
@@ -40,8 +39,7 @@ how to write templates, see the documentation.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -49,21 +47,23 @@ developing applications that use %{name}.
 %package apidocs
 Group: Development/Documentation
 Summary: Grantlee API documentation
+Requires: kde-filesystem
 BuildArch: noarch
-
 %description apidocs
 This package includes the Grantlee API documentation in HTML
 format for easy browsing.
 
+
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
-sed -i 's,${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX},%{_libdir},' CMakeLists.txt
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%cmake .. -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr
+%{cmake} \
+  -DCMAKE_BUILD_TYPE=release \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -72,38 +72,51 @@ make %{?_smp_mflags} -C %{_target_platform}
 make docs -C %{_target_platform}
 %endif
 
+
 %install
 rm -rf %{buildroot}
-make install -C %{_target_platform} DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
 %if 0%{?apidocs}
 mkdir -p %{buildroot}%{_docdir}/HTML/en/grantlee-apidocs
-cp -prf %{_target_platform}/apidocs/html/* %{buildroot}%{_docdir}/HTML/en/grantlee-apidocs
+cp -prf %{_target_platform}/apidox/* %{buildroot}%{_docdir}/HTML/en/grantlee-apidocs
 %endif
 
+
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG COPYING.LIB README GOALS
-%{_libdir}/lib%{name}*.so.*
-%{_libdir}/%{name}
+%{_libdir}/libgrantlee_core.so.0*
+%{_libdir}/libgrantlee_gui.so.0*
+%{_libdir}/grantlee/
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}
-%{_includedir}/%{name}_core.h
-%{_libdir}/lib%{name}*.so
+%{_includedir}/grantlee/
+%{_includedir}/grantlee_core.h
+%{_includedir}/grantlee_templates.h
+%{_libdir}/libgrantlee_core.so
+%{_libdir}/libgrantlee_gui.so
+%dir %{_libdir}/cmake
+%{_libdir}/cmake/grantlee/
 
-# %files apidocs
-# %{_docdir}/HTML/en/grantlee-apidocs
+%if 0%{?apidocs}
+%files apidocs
+%{_docdir}/HTML/en/grantlee-apidocs/
+%endif
 
 %changelog
+* Tue Jul 12 2011 Rex Dieter <rdieter at fedoraproject.org> 0.1.9-1
+- 0.1.9
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 95d2286..3f08053 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6260d3d05cf9e602668bcb0a35b49b2c  grantlee-0.1.6.tar.gz
+3d93b5312814ebee373fba5509d88bdb  grantlee-0.1.9.tar.gz