[mate-screensaver] Update to 1.7.0

[Dan Mashal]

commit 28deed3804a9ce34898078f05fd349aecdc17bd6
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri Dec 6 18:46:04 2013 -0800

    Update to 1.7.0

 .gitignore            |    1 +
 mate-screensaver.spec |   69 ++++++++++++++++++++++++++----------------------
 sources               |    2 +-
 3 files changed, 39 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7a2519..e1990ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /mate-screensaver-1.5.2.tar.xz
 /mate-screensaver-1.6.0.tar.xz
 /mate-screensaver-1.6.1.tar.xz
+/mate-screensaver-1.7.0.git0460034.tar.xz
diff --git a/mate-screensaver.spec b/mate-screensaver.spec
index 06dfb74..04dfc28 100644
--- a/mate-screensaver.spec
+++ b/mate-screensaver.spec
@@ -1,10 +1,17 @@
+%global _internal_version 0460034
 Name:           mate-screensaver
-Version:        1.6.1
-Release:        4%{?dist}
+Version:        1.7.0
+Release:        0.1.git%{_internal_version}1%{?dist}
+#Release:        1%{?dist}
 Summary:        MATE Screensaver
 License:        GPLv2+ and LGPLv2+
 URL:            http://pub.mate-desktop.org
-Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
+
+# To generate tarball
+# wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
+Source0:        http://vicodan.fedorapeople.org/%{name}-%{version}.git%{_internal_version}.tar.xz
+
+#Source0:        http://pub.mate-desktop.org/releases/1.7/%{name}-%{version}.tar.xz
 
 # upstream patch, improve systemd-login support
 # https://github.com/mate-desktop/mate-screensaver/pull/26
@@ -20,27 +27,25 @@ Requires:       gnome-keyring-pam
 Requires:       mate-keyring-pam
 %endif
 
-BuildRequires:  gtk2-devel
 BuildRequires:  dbus-glib-devel
-BuildRequires:  mate-menus-devel
-BuildRequires:  mate-desktop-devel
-BuildRequires:  pam-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gtk2-devel
+BuildRequires:  libX11-devel
 BuildRequires:  libXScrnSaver-devel
 BuildRequires:  libXinerama-devel
 BuildRequires:  libXmu-devel
-BuildRequires:  libmatekbd-devel
-BuildRequires:  libnotify-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  xorg-x11-proto-devel
-BuildRequires:  mate-common
+BuildRequires:  libXtst-devel
 BuildRequires:  libXxf86misc-devel
 BuildRequires:  libXxf86vm-devel
-BuildRequires:  libXtst-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  libmatekbd-devel
+BuildRequires:  libnotify-devel
 BuildRequires:  mate-common
-BuildRequires:  libX11-devel
+BuildRequires:  mate-desktop-devel
+BuildRequires:  mate-menus-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  pam-devel
 BuildRequires:  systemd-devel
-Buildrequires:  xmlto
+BuildRequires:  xorg-x11-proto-devel
 
 %description
 mate-screensaver is a screen saver and locker that aims to have
@@ -56,19 +61,21 @@ Development files for mate-screensaver
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_internal_version}
 %patch0 -p1 -b .systemd-login1
 
 %build
+NOCONFIGURE=1 ./autogen.sh
 %configure \
-            --with-x \
-            --with-mit-ext \
-            --with-xf86gamma-ext \
-            --with-shadow \
-            --with-console-kit \
-            --enable-docbook-docs \
-            --enable-locking \
-            --with-systemd \
+            --with-x                \
+            --with-mit-ext          \
+            --with-xf86gamma-ext    \
+            --with-libgl            \
+            --with-console-kit      \
+            --with-shadow           \
+            --enable-docbook-docs   \
+            --enable-locking        \
+            --with-systemd          \
             --enable-pam
 
 make %{?_smp_mflags} V=1
@@ -88,14 +95,8 @@ desktop-file-install                                          \
 
 # remove needless gsetting convert file
 rm -f %{buildroot}%{_datadir}/MateConf/gsettings/org.mate.screensaver.gschema.migrate
-
-# move doc dir for > f19
-%if 0%{?fedora} > 19
 mkdir -p %{buildroot}%{_datadir}/doc/%{name}
-mv -f %{buildroot}%{_datadir}/doc/%{name}-%{version}/spec/mate-screensaver.html %{buildroot}%{_datadir}/doc/%{name}/mate-screensaver.html
-%else
-mv -f %{buildroot}%{_datadir}/doc/%{name}-%{version}/spec/mate-screensaver.html %{buildroot}%{_datadir}/doc/%{name}-%{version}/mate-screensaver.html
-%endif
+mv -f %{buildroot}%{_datadir}/doc/%{name}-1.7.0/mate-screensaver.html %{buildroot}%{_datadir}/doc/%{name}/mate-screensaver.html
 
 %find_lang %{name}
 
@@ -121,6 +122,7 @@ fi
 %{_datadir}/mate-screensaver
 %{_datadir}/backgrounds/cosmos/
 %{_datadir}/pixmaps/mate-logo-white.svg
+%{_datadir}/pixmaps/gnome-logo-white.svg
 %{_datadir}/desktop-directories/mate-screensaver.directory
 %{_datadir}/glib-2.0/schemas/org.mate.screensaver.gschema.xml
 %{_datadir}/mate-background-properties/cosmos.xml
@@ -132,6 +134,9 @@ fi
 
 
 %changelog
+* Fri Dec 06 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.7.0-1.1.git0460034
+- Update to 1.7.0
+
 * Sat Oct 19 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-4
 - switch to gnome-keyring for > f19
 
diff --git a/sources b/sources
index 926c896..8f410c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54dc11bfd699b008a23f497295dd7d3d  mate-screensaver-1.6.1.tar.xz
+4a8a15944c07535e36fd913a20b572e0  mate-screensaver-1.7.0.git0460034.tar.xz