[marco] Update to 1.7.0

Dan Mashal vicodan at fedoraproject.org
Sun Feb 9 23:54:24 UTC 2014


commit 755027a733597ebb08509b3a9234ca127d3ffc2f
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Feb 9 15:54:39 2014 -0800

    Update to 1.7.0

 .gitignore |    1 +
 marco.spec |   27 +++++++++++++++------------
 sources    |    2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5071c1f..caed3b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /marco-1.7.0.git0403454e.tar.xz
 /marco-1.7.0-git20131212-62a708d.tar.xz
+/marco-1.7.0.tar.xz
diff --git a/marco.spec b/marco.spec
index 8675a6e..51c18ae 100644
--- a/marco.spec
+++ b/marco.spec
@@ -1,5 +1,5 @@
 # Conditional for release and snapshot builds. Uncomment for release-builds.
-# %%global rel_build 1
+%global rel_build 1
 
 # This is needed, because src-url contains branched part of versioning-scheme.
 %global branch 1.7
@@ -13,11 +13,11 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:           marco
-Version:       %{branch}.0
-Release:       0.5%{?git_rel}%{?dist}
-Summary:    MATE Desktop window manager
+Version:        %{branch}.0
+Release:        1%{?dist}
+Summary:        MATE Desktop window manager
 License:        LGPLv2+ and GPLv2+
-URL:              http://mate-desktop.org
+URL:            http://mate-desktop.org
 
 # for downloading the tarball use 'spectool -g -R marco.spec'
 # Source for release-builds.
@@ -33,9 +33,9 @@ Source4:        stock_minimize.png
 Source5:        window.png
 
 # needed for fixing initial-setup issue, rhbz (#962009)
-Patch0:         marco_add-pixbuf-inline-icons.patch
-Patch1:         marco_implement-side-by-side-tiling.patch
-Patch2:         marco_window-snapping-top-screen.patch
+#Patch0:         marco_add-pixbuf-inline-icons.patch
+#Patch1:         marco_implement-side-by-side-tiling.patch
+#Patch2:         marco_window-snapping-top-screen.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
@@ -76,17 +76,17 @@ Development files for marco
 
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
+
 # needed for missing `po/Makefile.in.in'
-NOCONFIGURE=1 ./autogen.sh
 cp %{SOURCE1} src/mini-window.png
 cp %{SOURCE2} src/stock_delete.png
 cp %{SOURCE3} src/stock_maximize.png
 cp %{SOURCE4} src/stock_minimize.png
 cp %{SOURCE5} src/window.png
 
-%patch0 -p1 -b .inline-icons
-%patch1 -p1 -b .tiling
-%patch2 -p1 -b .snapping-top-screen
+#%patch0 -p1 -b .inline-icons
+#%patch1 -p1 -b .tiling
+#%patch2 -p1 -b .snapping-top-screen
 
 autoreconf -if
 
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Sun Feb 09 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1
+- Update to 1.7.0
+
 * Fri Dec 20 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.0-0.5.git20131212.62a708d
 - make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser
 - use modern 'make install' macro
diff --git a/sources b/sources
index fa85901..ce80c7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2f2617e1e216e080bbfb5c1abf1b1c5  marco-1.7.0-git20131212-62a708d.tar.xz
+675e27391bbe0dc61851f9b8062568bb  marco-1.7.0.tar.xz


More information about the scm-commits mailing list