- Up to 1.1.0

diff --git a/mypaint.spec b/mypaint.spec
index 339f8a0a6b5a0298694e7861c6255844a631cd57..f16c4bb86204509ebfa4eab79e37ce64a9f5a331 100644 (file)
--- a/mypaint.spec
+++ b/mypaint.spec
@@ -1,13 +1,18 @@
+# TODO:
+# * create devel subpackage
+# * fix lang packaging
 Summary:       MyPaint is a fast and easy open-source graphics application for digital painters
 Summary(pl.UTF-8):     Szybka i łatwa w obsłudze aplikacja dla komputerowych malarzy.
 Name:          mypaint
-Version:       0.9.1
+Version:       1.1.0
 Release:       0.1
 License:       GPL
 Group:         X11/Applications/Graphics
 Source0:       http://download.gna.org/mypaint/%{name}-%{version}.tar.bz2
 URL:           http://mypaint.intilinux.com/
 BuildRequires: gettext-devel
+BuildRequires: json-c-devel
+BuildRequires: lcms2-devel
 BuildRequires: libpng-devel
 BuildRequires: python-numpy-numarray-devel
 BuildRequires: rpm-pythonprov
@@ -43,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 %scons prefix=$RPM_BUILD_ROOT%{_prefix} install
 
 # unsupported
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/nn_NO
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/nn_NO
 
 %find_lang %{name}
 
@@ -70,56 +75,42 @@ umask 022
 %attr(755,root,root) %{_libdir}/mypaint/*_mypaintlib.so
 %{_desktopdir}/mypaint.desktop
 %{_iconsdir}/hicolor/16x16/apps/mypaint.png
+%{_iconsdir}/hicolor/16x16/actions/*.png
 %{_iconsdir}/hicolor/22x22/apps/mypaint.png
+%{_iconsdir}/hicolor/22x22/actions/*.png
 %{_iconsdir}/hicolor/24x24/apps/mypaint.png
+%{_iconsdir}/hicolor/24x24/actions/*.png
 %{_iconsdir}/hicolor/32x32/apps/mypaint.png
+%{_iconsdir}/hicolor/32x32/actions/*.png
 %{_iconsdir}/hicolor/48x48/apps/mypaint.png
+%{_iconsdir}/hicolor/48x48/actions/*.png
 %{_iconsdir}/hicolor/scalable/apps/mypaint.svg
+%{_iconsdir}/hicolor/scalable/actions/*.svg
 %dir %{_datadir}/mypaint
 %{_datadir}/mypaint/backgrounds
 %dir %{_datadir}/mypaint/brushes
+%{_datadir}/mypaint/brushes/FX_blender_prev.png
 %{_datadir}/mypaint/brushes/classic
 %{_datadir}/mypaint/brushes/deevad
 %{_datadir}/mypaint/brushes/experimental
 %{_datadir}/mypaint/brushes/ramon
 %{_datadir}/mypaint/brushes/tanda
-%{_datadir}/mypaint/brushes/FX_blender_prev
+#%{_datadir}/mypaint/brushes/FX_blender_prev
 %attr(755,root,root) %{_datadir}/mypaint/brushes/label-brush-mypaint.sh
 %{_datadir}/mypaint/brushes/order.conf
 %{_datadir}/mypaint/brushes/prev-template.xcf.gz
 %dir %{_datadir}/mypaint/brushlib
 %{_datadir}/mypaint/brushlib/__init__.py
 %{_datadir}/mypaint/brushlib/brushsettings.py
+%{_datadir}/mypaint/brushlib/brushsettings.json
 %attr(755,root,root) %{_datadir}/mypaint/brushlib/generate.py
 %dir %{_datadir}/mypaint/gui
-%{_datadir}/mypaint/gui/application.py
-%{_datadir}/mypaint/gui/backgroundwindow.py
-%{_datadir}/mypaint/gui/brushcreationwidget.py
-%{_datadir}/mypaint/gui/brushmanager.py
-%{_datadir}/mypaint/gui/brushselectionwindow.py
-%{_datadir}/mypaint/gui/brushsettingswindow.py
-%{_datadir}/mypaint/gui/colorhistory.py
-%{_datadir}/mypaint/gui/colorpicker.py
-%attr(755,root,root) %{_datadir}/mypaint/gui/colorsamplerwindow.py
-%{_datadir}/mypaint/gui/colorselectionwindow.py
-%{_datadir}/mypaint/gui/cursor.py
-%{_datadir}/mypaint/gui/dialogs.py
-%{_datadir}/mypaint/gui/document.py
-%{_datadir}/mypaint/gui/drawwindow.py
-%{_datadir}/mypaint/gui/filehandling.py
-%{_datadir}/mypaint/gui/functionwindow.py
-%{_datadir}/mypaint/gui/gtkexcepthook.py
-%{_datadir}/mypaint/gui/historypopup.py
-%{_datadir}/mypaint/gui/__init__.py
-%{_datadir}/mypaint/gui/inputtestwindow.py
-%{_datadir}/mypaint/gui/keyboard.py
-%{_datadir}/mypaint/gui/layerswindow.py
-%{_datadir}/mypaint/gui/main.py
-%{_datadir}/mypaint/gui/menu.xml
-%{_datadir}/mypaint/gui/pixbuflist.py
-%{_datadir}/mypaint/gui/preferenceswindow.py
-%{_datadir}/mypaint/gui/stategroup.py
-%{_datadir}/mypaint/gui/tileddrawwidget.py
-%{_datadir}/mypaint/gui/windowing.py
+#%attr(755,root,root) %{_datadir}/mypaint/gui/colorsamplerwindow.py
+%{_datadir}/mypaint/gui/*.xml
+%{_datadir}/mypaint/gui/*.py
+%dir %{_datadir}/mypaint/gui/colors
+%{_datadir}/mypaint/gui/colors/*.py
+%dir %{_datadir}/mypaint/palettes
+%{_datadir}/mypaint/palettes/*.gpl
 %{_datadir}/mypaint/lib
 %{_datadir}/mypaint/pixmaps