From 6b2b09d60d23d473924e2569bdb9f2a77bcd937a Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 7 Jun 2010 12:13:58 +0000
Subject: [PATCH] lensfun-0.2.5 add CC-BY-SA to main package license tag for
 lens data don't     ship GPLv3 text as nothing is licensed under it currently
 mark     documentation files as such shorten summaries, expand package    
 descriptions

---
 .cvsignore   |  2 +-
 lensfun.spec | 37 +++++++++++++++++++++++++++----------
 sources      |  2 +-
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 98b2547..40e704b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lensfun-0.2.4.tar.bz2
+lensfun-0.2.5.tar.bz2
diff --git a/lensfun.spec b/lensfun.spec
index 8d35f03..6c4343d 100644
--- a/lensfun.spec
+++ b/lensfun.spec
@@ -2,10 +2,10 @@
 # Fedora pkg-review: http://bugzilla.redhat.com/466764
 
 Name: lensfun
-Version: 0.2.4
-Summary: A library to rectify the defects introduced by your photographic equipment
+Version: 0.2.5
+Summary: Library to rectify defects introduced by photographic lenses
 Release: 1%{?dist} 
-License: LGPLv3
+License: LGPLv3 and CC-BY-SA
 Group: System Environment/Libraries
 URL: http://lensfun.berlios.de/
 Source0: http://download.berlios.de/lensfun/lensfun-%{version}.tar.bz2
@@ -19,16 +19,23 @@ BuildRequires: python
 BuildRequires: zlib-devel
 
 %description
-%{summary}.
+The lensfun library provides an open source database of photographic lenses and
+their characteristics. It not only provides a way to read and search the
+database, but also provides a set of algorithms for correcting images based on
+detailed knowledge of lens properties. Right now lensfun is designed to correct
+distortion, transversal (also known as lateral) chromatic aberrations,
+vignetting and color contribution of a lens.
 
 %package devel
-Summary: Development tools for %{name}
+Summary: Development toolkit for %{name}
 Group:   Development/Libraries
+License: LGPLv3
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-%description devel
-%{summary}.
 
+%description devel
+This package contains library and header files needed to build applications
+using lensfun.
 
 %prep
 %setup -q 
@@ -71,20 +78,30 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}/
-%{_docdir}/%{name}-%{version}/README
-%{_docdir}/%{name}-%{version}/*.txt
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/*.txt
+# currently, nothing is covered by GPLv3 (no apps in the package), no need to
+# confuse people:
+%exclude %{_docdir}/%{name}-%{version}/gpl-3.0.txt
 %{_datadir}/lensfun/
 %{_libdir}/liblensfun.so.0*
 
 %files devel
 %defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}/manual/
+%doc %{_docdir}/%{name}-%{version}/manual/
 %{_includedir}/lensfun.h
 %{_libdir}/liblensfun.so
 %{_libdir}/pkgconfig/lensfun.pc
 
 
 %changelog
+* Mon Jun 07 2010 Nils Philippsen <nils@redhat.com> 0.2.5-1
+- lensfun-0.2.5
+- add CC-BY-SA to main package license tag for lens data
+- don't ship GPLv3 text as nothing is licensed under it currently
+- mark documentation files as such
+- shorten summaries, expand package descriptions
+
 * Sun Oct 18 2009 Rex Dieter <rdieter@fedoraproject.orG> 0.2.4-1
 - lensfun-0.2.4 (#529506)
 
diff --git a/sources b/sources
index af531e2..a25fd67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce5c25fc708d1c629d485fbf959dc1cc  lensfun-0.2.4.tar.bz2
+a10438dffae68a5988fc54b0393a3755  lensfun-0.2.5.tar.bz2