- 3.2.0

- merged from DEVEL

Changed files:
    gnome-color-manager.spec -> 1.13

diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index f859baf11fd33dba28254a81331c897498ce2d80..6180892b699fd28c215cbec5c35676e99ff6fd3d 100644 (file)
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -1,49 +1,48 @@
 Summary:       Color management tools for GNOME
 Name:          gnome-color-manager
-Version:       3.0.0
+Version:       3.2.0
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-color-manager/3.0/%{name}-%{version}.tar.bz2
-# Source0-md5: 6195fc713212afd189fd280977e85c92
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-color-manager/3.2/%{name}-%{version}.tar.xz
+# Source0-md5: 189d51eb28d7b60a95f502b823b297c4
 URL:           http://projects.gnome.org/gnome-color-manager/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.9
-BuildRequires: cups-devel
+BuildRequires: colord-devel >= 0.1.12
 BuildRequires: docbook-dtd41-sgml
 BuildRequires: docbook-utils
 BuildRequires: exiv2-devel
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.26.0
 BuildRequires: gnome-common
-BuildRequires: gnome-control-center-devel >= 3.0.0
 BuildRequires: gnome-doc-utils
-BuildRequires: gnome-settings-daemon-devel >= 3.0.0
-BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.9
 BuildRequires: intltool >= 0.35.0
-BuildRequires: lcms2-devel
+BuildRequires: lcms2-devel >= 2.2
 BuildRequires: libcanberra-gtk3-devel >= 0.10
-BuildRequires: libnotify-devel >= 0.7.0
+BuildRequires: libexif-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool
-BuildRequires: libusb-devel
+BuildRequires: mash-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.601
-BuildRequires: sane-backends-devel
-BuildRequires: udev-glib-devel
+BuildRequires: tar >= 1:1.22
 BuildRequires: vte-devel >= 0.28.0
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-lib-libXxf86vm-devel
+BuildRequires: xz
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): glib2 >= 1:2.26.0
+Requires:      colord >= 0.1.12
 Requires:      dconf
 Requires:      hicolor-icon-theme
 Requires:      polkit-gnome
 Suggests:      shared-color-profiles
+Obsoletes:     gnome-color-manager-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,28 +50,12 @@ 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.
 
-%package devel
-Summary:       GNOME Color Manager development files
-Summary(pl.UTF-8):     Pliki programistyczne GNOME Color Manager
-Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.26.0
-Requires:      lcms2-devel
-Requires:      libusb-devel
-Requires:      udev-glib-devel
-
-%description devel
-GNOME Color Manager development files.
-
-%description devel -l pl.UTF-8
-Pliki programistyczne GNOME Color Manager.
-
 %prep
 %setup -q
 
 %build
-%{__intltoolize}
 %{__libtoolize}
+%{__intltoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
@@ -89,10 +72,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.la
-
 %find_lang %{name} --with-gnome --with-omf
 
 %clean
@@ -113,40 +92,18 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/gcm-apply
+%attr(755,root,root) %{_bindir}/gcm-calibrate
 %attr(755,root,root) %{_bindir}/gcm-import
 %attr(755,root,root) %{_bindir}/gcm-inspect
 %attr(755,root,root) %{_bindir}/gcm-picker
 %attr(755,root,root) %{_bindir}/gcm-viewer
-%attr(755,root,root) %{_bindir}/gcm-session
-%attr(755,root,root) %{_libdir}/libcolor-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcolor-glib.so.1
 %attr(755,root,root) %{_libexecdir}/gcm-helper-exiv
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libcolor.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libcolor.so
-%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
-%attr(755,root,root) %{_sbindir}/gcm-install-system-wide
-%attr(755,root,root) /lib/udev/gcm-udev-ddc
-/lib/udev/rules.d/55-gcm-i2c.rules
-/lib/udev/rules.d/95-gcm-colorimeters.rules
-/lib/udev/rules.d/95-gcm-devices.rules
-%{_sysconfdir}/xdg/autostart/gcm-apply.desktop
-%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate
-%{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml
-%{_datadir}/dbus-1/services/org.gnome.ColorManager.service
-%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
 %{_datadir}/gnome-color-manager
-%{_datadir}/polkit-1/actions/org.gnome.color.policy
+%{_datadir}/dbus-1/services/org.gnome.ColorManager.service
+%{_desktopdir}/gcm-calibrate.desktop
 %{_desktopdir}/gcm-import.desktop
-%{_desktopdir}/gcm-prefs.desktop
+%{_desktopdir}/gcm-picker.desktop
 %{_desktopdir}/gcm-viewer.desktop
 %{_iconsdir}/hicolor/*/*/*.png
 %{_iconsdir}/hicolor/*/*/*.svg
 %{_mandir}/man1/*.1*
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcolor-glib.so
-%{_includedir}/libcolor-glib
-%{_pkgconfigdir}/libcolor-glib.pc