From 156eb83ac6b277bce613e6ce9ff0fce9e7f30973 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 27 May 2011 17:29:11 -0400
Subject: [PATCH] Remove G_BROKEN_FILENAMES; Closes: #708536

---
 glib2.csh  |  6 ------
 glib2.sh   |  6 ------
 glib2.spec | 13 ++++---------
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 glib2.csh
 delete mode 100644 glib2.sh

diff --git a/glib2.csh b/glib2.csh
deleted file mode 100644
index 3a7d294..0000000
--- a/glib2.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-
-## This caused GLib2 applications to convert filenames from 
-## locale encoding to UTF-8. If the locale encoding is already
-## UTF-8 then it makes no difference.
-
-setenv G_BROKEN_FILENAMES 1
diff --git a/glib2.sh b/glib2.sh
deleted file mode 100644
index e8fd18d..0000000
--- a/glib2.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-
-## This caused GLib2 applications to convert filenames from 
-## locale encoding to UTF-8. If the locale encoding is already
-## UTF-8 then it makes no difference.
-
-export G_BROKEN_FILENAMES=1
diff --git a/glib2.spec b/glib2.spec
index 6f0e66a..2744099 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,14 +3,12 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.29.4
-Release: 1%{?dist}
+Release: 2%{?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.29/glib-%{version}.tar.bz2
-Source2: glib2.sh
-Source3: glib2.csh
 
 BuildRequires: pkgconfig
 BuildRequires: gamin-devel
@@ -73,11 +71,6 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-## glib2.sh and glib2.csh
-./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
@@ -110,7 +103,6 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{libdir}/libgmodule-2.0.so.*
 %{libdir}/libgobject-2.0.so.*
 %{libdir}/libgio-2.0.so.*
-%{_sysconfdir}/profile.d/*
 %{_sysconfdir}/bash_completion.d/*.sh
 %dir %{_datadir}/glib-2.0
 %dir %{_datadir}/glib-2.0/schemas
@@ -167,6 +159,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 
 
 %changelog
+* Fri May 27 2011 Colin Walters <walters@verbum.org> - 2.29.4-2
+- Remove G_BROKEN_FILENAMES; Closes: #708536
+
 * Fri May  6 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.29.4-1
 - Update to 2.29.4