[glib2/f14/master] The last two commits went onto the wrong branch

[Matthias Clasen]

commit b86ec48735bf852d792ec15173b9b9cf509373fd
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Sep 21 09:42:51 2010 -0400

    The last two commits went onto the wrong branch

 .gitignore |    1 -
 glib2.spec |   18 ++++--------------
 sources    |    2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 696b09c..69f6ab5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ glib-2.25.12.tar.bz2
 glib-2.25.13.tar.bz2
 /glib-2.25.14.tar.bz2
 /glib-2.25.15.tar.bz2
-/glib-2.27.0.tar.bz2
diff --git a/glib2.spec b/glib2.spec
index 2244f8b..cefdcdd 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -2,13 +2,13 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.27.0
-Release: 2%{?dist}
+Version: 2.25.15
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 #VCS: git:git://git.gnome.org/glib
-Source: http://download.gnome.org/sources/glib/2.27/glib-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/glib/2.25/glib-%{version}.tar.bz2
 Source1: update-gio-modules
 Source2: glib2.sh
 Source3: glib2.csh
@@ -82,13 +82,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
 
 # Install multilib wrappers for the binaries
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gio-modules
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gio-modules
 
 mv  $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-%{__isa_bits}
 
-# bash-completion scripts need not be executable
-chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/*.sh
-
 %find_lang glib20
 
 
@@ -161,13 +158,6 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_libdir}/lib*.a
 
 %changelog
-* Mon Sep 20 2010 Matthias Clasen <mclasen at redhat.com> - 2.27.0-2
-- Make /usr/bin/update-gio-modules executable
-- Make /etc/bash_completion.d/*.sh not executable
-
-* Mon Sep 20 2010 Matthias Clasen <mclasen at redhat.com> - 2.27.0-1
-- Update to 2.27.0
-
 * Tue Aug 31 2010 Matthias Clasen <mclasen at redhat.com> - 2.25.15-1
 - Update to 2.25.15
 
diff --git a/sources b/sources
index 4cf2f09..fda57a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51be266159093b6bde9ec690cd3087f9  glib-2.27.0.tar.bz2
+cbcca065bd20e37b2c633725934b8b06  glib-2.25.15.tar.bz2