- updated to 3.18.0

- added symlinks patch (workaround for rpm glob problems)

diff --git a/gnome-color-manager-symlinks.patch b/gnome-color-manager-symlinks.patch
new file mode 100644 (file)
index 0000000..469565d
--- /dev/null
+++ b/gnome-color-manager-symlinks.patch
@@ -0,0 +1,88 @@
+--- gnome-color-manager-3.18.0/data/icons/16x16/Makefile.am.orig       2015-04-22 12:18:32.000000000 +0200
++++ gnome-color-manager-3.18.0/data/icons/16x16/Makefile.am    2015-11-15 08:37:29.554534670 +0100
+@@ -9,7 +9,7 @@ icons_DATA =                           \
+ 
+ install-data-hook:
+       mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes;
+-      ln -fs $(iconsdir)/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
++      ln -fs ../apps/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
+ 
+ EXTRA_DIST =          \
+       $(icons_DATA)
+--- gnome-color-manager-3.18.0/data/icons/22x22/Makefile.am.orig       2015-04-22 12:18:32.000000000 +0200
++++ gnome-color-manager-3.18.0/data/icons/22x22/Makefile.am    2015-11-15 08:37:48.561200509 +0100
+@@ -9,7 +9,7 @@ icons_DATA =                           \
+ 
+ install-data-hook:
+       mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes;
+-      ln -fs $(iconsdir)/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
++      ln -fs ../apps/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
+ 
+ EXTRA_DIST =          \
+       $(icons_DATA)
+--- gnome-color-manager-3.18.0/data/icons/24x24/Makefile.am.orig       2015-04-22 12:18:32.000000000 +0200
++++ gnome-color-manager-3.18.0/data/icons/24x24/Makefile.am    2015-11-15 08:38:05.651199278 +0100
+@@ -9,7 +9,7 @@ icons_DATA =                           \
+ 
+ install-data-hook:
+       mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes;
+-      ln -fs $(iconsdir)/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
++      ln -fs ../apps/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
+ 
+ EXTRA_DIST =          \
+       $(icons_DATA)
+--- gnome-color-manager-3.18.0/data/icons/256x256/Makefile.am.orig     2015-04-22 12:18:32.000000000 +0200
++++ gnome-color-manager-3.18.0/data/icons/256x256/Makefile.am  2015-11-15 08:38:17.937865942 +0100
+@@ -9,7 +9,7 @@ icons_DATA =                           \
+ 
+ install-data-hook:
+       mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes;
+-      ln -fs $(iconsdir)/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
++      ln -fs ../apps/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
+ 
+ EXTRA_DIST =          \
+       $(icons_DATA)
+--- gnome-color-manager-3.18.0/data/icons/32x32/Makefile.am.orig       2015-04-22 12:18:32.000000000 +0200
++++ gnome-color-manager-3.18.0/data/icons/32x32/Makefile.am    2015-11-15 08:38:30.904532080 +0100
+@@ -9,7 +9,7 @@ icons_DATA =                           \
+ 
+ install-data-hook:
+       mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes;
+-      ln -fs $(iconsdir)/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
++      ln -fs ../apps/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
+ 
+ EXTRA_DIST =          \
+       $(icons_DATA)
+--- gnome-color-manager-3.18.0/data/icons/48x48/Makefile.am.orig       2015-04-22 12:18:32.000000000 +0200
++++ gnome-color-manager-3.18.0/data/icons/48x48/Makefile.am    2015-11-15 08:38:43.261198508 +0100
+@@ -9,7 +9,7 @@ icons_DATA =                           \
+ 
+ install-data-hook:
+       mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes;
+-      ln -fs $(iconsdir)/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
++      ln -fs ../apps/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
+ 
+ EXTRA_DIST =          \
+       $(icons_DATA)
+--- gnome-color-manager-3.18.0/data/icons/64x64/Makefile.am.orig       2015-04-22 12:18:32.000000000 +0200
++++ gnome-color-manager-3.18.0/data/icons/64x64/Makefile.am    2015-11-15 08:39:10.224530429 +0100
+@@ -9,7 +9,7 @@ icons_DATA =                           \
+ 
+ install-data-hook:
+       mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes;
+-      ln -fs $(iconsdir)/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
++      ln -fs ../apps/gnome-color-manager.png $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.png;
+ 
+ EXTRA_DIST =          \
+       $(icons_DATA)
+--- gnome-color-manager-3.18.0/data/icons/scalable/Makefile.am.orig    2015-04-22 12:18:32.000000000 +0200
++++ gnome-color-manager-3.18.0/data/icons/scalable/Makefile.am 2015-11-15 08:35:22.674540143 +0100
+@@ -14,7 +14,7 @@ appicons_DATA =                      \
+ 
+ install-data-hook:
+       mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes;
+-      ln -fs $(iconsdir)/gnome-color-manager.svg $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.svg;
++      ln -fs ../apps/gnome-color-manager.svg $(DESTDIR)$(DATADIR)/icons/hicolor/$(size)/mimetypes/application-vnd.iccprofile.svg;
+ 
+ EXTRA_DIST =                          \
+       $(icons_DATA)                   \

diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index da348f9104e9c00feb33a3bae85d942c10678df6..bc5772f7e923e9e2c533dbe842b8fff5fc200008 100644 (file)
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -1,17 +1,21 @@
 Summary:       Color management tools for GNOME
+Summary(pl.UTF-8):     Narzędzia do zarządzania kolorami dla GNOME
 Name:          gnome-color-manager
-Version:       3.14.2
-Release:       2
+Version:       3.18.0
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-color-manager/3.14/%{name}-%{version}.tar.xz
-# Source0-md5: 800ea5d887e3d93a7b6000d89f5e3508
-URL:           http://projects.gnome.org/gnome-color-manager/
-BuildRequires: appstream-builder-devel
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-color-manager/3.18/%{name}-%{version}.tar.xz
+# Source0-md5: 2449922874fc93801dc8cd41b2528090
+# rpm glob again has some problem with absolute symlinks (dead at the time of packaging);
+# use relative ones (they don't go across /)
+Patch0:                %{name}-symlinks.patch
+# dead, wiki.gnome.org GnomeColorManager page is in Attic too
+#URL:          http://projects.gnome.org/gnome-color-manager/
+URL:           https://github.com/GNOME/gnome-color-manager
+BuildRequires: appstream-glib-devel
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
-BuildRequires: clutter-devel >= 1.12.0
-BuildRequires: clutter-gtk-devel
 BuildRequires: colord-devel >= 0.1.34
 BuildRequires: colord-gtk-devel >= 0.1.20
 BuildRequires: docbook-dtd41-sgml
@@ -20,8 +24,6 @@ BuildRequires:        exiv2-devel
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.32.0
 BuildRequires: gnome-common
-BuildRequires: gnome-desktop-devel >= 3.0.0
-BuildRequires: gnome-doc-utils
 BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.9
 BuildRequires: intltool >= 0.40.0
@@ -29,23 +31,25 @@ BuildRequires:      lcms2-devel >= 2.2
 BuildRequires: libcanberra-gtk3-devel >= 0.10
 BuildRequires: libexif-devel
 BuildRequires: libtiff-devel
-BuildRequires: libtool
-BuildRequires: mash-devel
+BuildRequires: libtool >= 2:2
+BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.601
 BuildRequires: tar >= 1:1.22
 BuildRequires: vte-devel >= 0.28.0
-BuildRequires: xorg-lib-libXrandr-devel
-BuildRequires: xorg-lib-libXxf86vm-devel
 BuildRequires: xz
+BuildRequires: yelp-tools
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): glib2 >= 1:2.26.0
+Requires(post,postun): glib2 >= 1:2.32.0
 Requires:      colord >= 0.1.34
-Requires:      dconf
+Requires:      colord-gtk >= 0.1.20
+Requires:      glib2 >= 1:2.32.0
 Requires:      hicolor-icon-theme
-Requires:      polkit-gnome
+Requires:      lcms2 >= 2.2
+Requires:      libcanberra-gtk3 >= 0.10
+Requires:      vte >= 0.28.0
 Suggests:      shared-color-profiles
 Obsoletes:     gnome-color-manager-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,8 +59,14 @@ GNOME Color Manager is a session framework for the GNOME desktop
 environment that makes it easy to manage easy to manage, install and
 generate color profiles.
 
+%description -l pl.UTF-8
+GNOME Color Manager to szkielet sesyjny dla środowiska graficznego
+GNOME ułatwiający zarządzanie, instalowanie i generowanie profili
+kolorów.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -77,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/gcm-calibrate
 %attr(755,root,root) %{_bindir}/gcm-import
 %attr(755,root,root) %{_bindir}/gcm-inspect
@@ -109,6 +119,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/gcm-import.desktop
 %{_desktopdir}/gcm-picker.desktop
 %{_desktopdir}/gcm-viewer.desktop
-%{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.svg
-%{_mandir}/man1/*.1*
+%{_iconsdir}/hicolor/*x*/apps/gnome-color-manager.png
+%{_iconsdir}/hicolor/*/mimetypes/application-vnd.iccprofile.png
+%{_iconsdir}/hicolor/scalable/apps/gnome-color-manager.svg
+%{_iconsdir}/hicolor/scalable/mimetypes/application-vnd.iccprofile.svg
+%{_mandir}/man1/gcm-calibrate.1*
+%{_mandir}/man1/gcm-import.1*
+%{_mandir}/man1/gcm-inspect.1*
+%{_mandir}/man1/gcm-picker.1*
+%{_mandir}/man1/gcm-viewer.1*