[mypaint] Update to 1.0.0 Add brush sets Ramon2 and Concept Design

[Christoph Wickert]

commit ee08b1bc5e2697696ca8a146910880a923b5f0da
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Jan 10 01:09:46 2012 +0100

    Update to 1.0.0
    Add brush sets Ramon2 and Concept Design

 .gitignore   |    3 +++
 mypaint.spec |   48 ++++++++++++++++++++++++++++++++++++++++--------
 sources      |    4 +++-
 3 files changed, 46 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 007ff3b..3c114f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 mypaint-0.8.2.tar.bz2
 /mypaint-0.9.1.tar.bz2
+/mypaint-1.0.0.tar.bz2
+/Concept%20Design.zip
+/ramon2.zip
diff --git a/mypaint.spec b/mypaint.spec
index 722146c..36940fe 100644
--- a/mypaint.spec
+++ b/mypaint.spec
@@ -1,21 +1,25 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           mypaint
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        A fast and easy graphics application for digital painters
 
 Group:          Applications/Multimedia
 # MyPaint is GPLv2+, brush library LGPLv2+
-License:        GPLv2+ and LGPLv2+
+# Ramon and CD_concept brushes are CC-BY
+License:        GPLv2+ and LGPLv2+ and CC-BY
 URL:            http://mypaint.intilinux.com/
 Source0:        http://download.gna.org/mypaint/%{name}-%{version}.tar.bz2
+Source1:        http://mypaintatelier.googlecode.com/files/ramon2.zip
+Source2:        http://mypaintatelier.googlecode.com/files/Concept%20Design.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, gtk2-devel, pygtk2-devel
 BuildRequires:  numpy, scons, swig, protobuf-devel
 BuildRequires:  desktop-file-utils, gettext, intltool
 Requires:       gtk2, numpy, pygtk2, python, protobuf-python
+Requires:       %{name}-data = %{version}-%{release}
 
 %description
 MyPaint is a fast and easy graphics application for digital painters. It lets 
@@ -23,8 +27,28 @@ you focus on the art instead of the program. You work on your canvas with
 minimum distractions, bringing up the interface only when you need it.
 
 
+%package        data
+Summary:        Common data files for for %{name}
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description    data
+The %{name}-data package contains common data files for %{name}.
+
+
 %prep
 %setup -q
+
+# Ramon2 brushes
+unzip %{SOURCE1} -x order.conf -d brushes
+unzip -p %{SOURCE1} order.conf >> brushes/order.conf
+mv brushes/readme.txt README.Ramon2
+
+# Concept Design brushes
+unzip %{SOURCE2} -x order.conf -d brushes
+unzip -p %{SOURCE2} order.conf >> brushes/order.conf
+mv brushes/readme.txt README.CD_concept
+
 # the Options class is deprecated; use the Variables class instead
 sed -i 's|PathOption|PathVariable|g' SConstruct
 sed -i 's|Options|Variables|g' SConstruct
@@ -47,7 +71,6 @@ scons prefix=$RPM_BUILD_ROOT%{_prefix} install
 desktop-file-install --vendor="fedora" \
   --delete-original \
   --remove-key="Encoding" \
-  --add-category="RasterGraphics;GTK;" \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
@@ -81,15 +104,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc changelog COPYING LICENSE README doc/
+%doc changelog COPYING LICENSE README README.CD_concept README.Ramon2 doc/
+%dir %{_libdir}/mypaint/
+%{_libdir}/mypaint/_mypaintlib.so
+
+
+%files data
+%defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_datadir}/icons/hicolor/*/apps/mypaint.*
 %{_datadir}/applications/fedora-%{name}.desktop
-%dir %{_libdir}/mypaint/
-%{_libdir}/mypaint/_mypaintlib.so
+%{_datadir}/icons/hicolor/*/*/*
+
 
 %changelog
+* Tue Jan 10 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
+- Update to 1.0.0
+- Add brush sets Ramon2 and Concept Design
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.9.1-2
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index d260f0e..c2cc7d6 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-6249a16359a438d6dc658f5765b35515  mypaint-0.9.1.tar.bz2
+dcd43933746a4579e7994f506e097823  mypaint-1.0.0.tar.bz2
+fdd6b6f028d1ce9240ea084403d15ec4  Concept%20Design.zip
+b7551bf926b4a6eba21e5c75de1bebab  ramon2.zip