[rawstudio/f14/master: 2/2] Merge branch 'master' into f14

[Gianluca Sforna]

commit 2ffec8d7f2cf4a0961c24b681bb5cd8a9d253130
Merge: a632f54 6bbb3ef
Author: Gianluca Sforna <giallu at gmail.com>
Date:   Thu Apr 14 11:45:08 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	rawstudio.spec

 .gitignore                    |    1 +
 rawstudio-1.2-no_werror.patch |   10 ----------
 rawstudio.spec                |   24 +++++++++++++-----------
 sources                       |    2 +-
 4 files changed, 15 insertions(+), 22 deletions(-)
---
diff --cc rawstudio.spec
index 79f112b,736cb4c..96dfc8c
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@@ -104,17 -102,18 +102,21 @@@ update-desktop-database &> /dev/null ||
  %{_datadir}/icons/rawstudio.png
  
  %files -n librawstudio
- %{_libdir}/librawstudio-2.0BETA1.so.*
+ %{_libdir}/librawstudio-2.0.so.*
  
  %files -n librawstudio-devel
- %{_includedir}/rawstudio-2.0BETA1
- %{_libdir}/librawstudio-2.0BETA1.so
- %{_libdir}/pkgconfig/rawstudio-2.0BETA1.pc
+ %{_includedir}/rawstudio-2.0
+ %{_libdir}/librawstudio-2.0.so
+ %{_libdir}/pkgconfig/rawstudio-2.0.pc
  
  %changelog
 -* Fri Apr  8 2011 Gianluca Sforna <giallu at gmail.com> - 2.0-1
++* Thu Apr 14 2011 Gianluca Sforna <giallu at gmail.com> - 2.0-1
+ - Update to final release
+ - remove upstreamed patch
+ 
 +* Mon Apr 11 2011 Rex Dieter <rdieter at fedoraproject.org> - 2.0-0.1.beta1.1
 +- rebuild (exiv2)
 +
  * Sat Mar 26 2011 Gianluca Sforna <giallu at gmail.com> - 2.0-0.1.beta1
  - Update to released beta
  - Split librawstudio library in own package