From a02fa4f05bf1e7f835eef89253e87c02558f1a9e Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Mon, 12 Aug 2013 11:51:05 +0200
Subject: [PATCH] Update to 0.4.1

---
 .gitignore   |  1 +
 libkate.spec | 32 +++++++++++++-------------------
 sources      |  2 +-
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index f43ae4a..0c74e22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libkate-0.3.7.tar.gz
 /libkate-0.3.8.tar.gz
+/libkate-0.4.1.tar.gz
diff --git a/libkate.spec b/libkate.spec
index 0a13fd8..0f41d1f 100644
--- a/libkate.spec
+++ b/libkate.spec
@@ -1,15 +1,12 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:           libkate
-Version:        0.3.8
-Release:        8%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Libraries to handle the Kate bitstream format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.google.com/p/libkate/
 Source0:        http://libkate.googlecode.com/files/libkate-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 BuildRequires:  libogg-devel
@@ -17,7 +14,7 @@ BuildRequires:  liboggz
 BuildRequires:  libpng-devel
 BuildRequires:  bison
 BuildRequires:  flex
-%ifnarch s390 s390x %{sparc} %{arm}
+%ifnarch s390 %{sparc}
 BuildRequires:  valgrind
 %endif
 BuildRequires:  doxygen
@@ -72,8 +69,7 @@ rm tools/kate_lexer.c
 
 
 %build
-%configure --disable-static \
-  --docdir=%{_docdir}/%{name}-%{version}
+%configure --disable-static
 
 # Remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -83,7 +79,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -96,9 +91,6 @@ touch -r $RPM_BUILD_ROOT%{_includedir}/kate/kate_config.h \
 make check
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post -p /sbin/ldconfig
 
@@ -106,20 +98,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
-%exclude %{_docdir}/libkate-%{version}/html
-%doc %{_docdir}/libkate-%{version}
+%exclude %{_docdir}/libkate/html
+%doc %{_docdir}/libkate
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc examples/
 %{_includedir}/kate/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %files utils
-%defattr(-,root,root,-)
 %{python_sitelib}/kdj/
 %{_bindir}/KateDJ
 %{_bindir}/katalyzer
@@ -131,11 +120,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/kateenc.*
 
 %files docs
-%defattr(-,root,root,-)
-%doc %{_docdir}/libkate-%{version}/html
+%doc %{_docdir}/libkate/html
 
 
 %changelog
+* Mon Aug 12 2013 Nicolas Chauvet <kwizart@gmail.com> - 0.4.1-1
+- Update to 0.4.1
+- Spec file clean-up
+- Avoid valgrind restriction on certain arches
+- Use unversioned docdir - rhbz#993818
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.8-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index feb1764..600c148 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7489ddebedf8d9888a05496dedf83c71  libkate-0.3.8.tar.gz
+1dfdbdeb2fa5d07063cf5b8261111fca  libkate-0.4.1.tar.gz