Accepting request 60708 from home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60708
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=136
This commit is contained in:
Vincent Untz 2011-02-13 20:41:37 +00:00 committed by Git OBS Bridge
parent cf843e5b5f
commit 441debdd21
2 changed files with 14 additions and 9 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Feb 13 14:11:08 CET 2011 - vuntz@opensuse.org
- Pass %{?no_lang_C} to %find_lang so that english documentation
can be packaged with the program, and not in the lang subpackage.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 8 20:30:41 UTC 2011 - fcrozat@novell.com Tue Feb 8 20:30:41 UTC 2011 - fcrozat@novell.com
@ -5,6 +11,8 @@ Tue Feb 8 20:30:41 UTC 2011 - fcrozat@novell.com
+ Bugs fixed: bgo#641363, bgo#641395, bgo#641411, bgo#641477, + Bugs fixed: bgo#641363, bgo#641395, bgo#641411, bgo#641477,
bgo#641572, bgo#641688 bgo#641572, bgo#641688
+ Updated translations. + Updated translations.
- Update glib2-use-old-pcre.patch to change configure script too.
Add call to autoreconf for the patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 27 10:11:56 CET 2011 - vuntz@opensuse.org Thu Jan 27 10:11:56 CET 2011 - vuntz@opensuse.org

View File

@ -159,7 +159,7 @@ License: LGPLv2+
Summary: General-Purpose Utility Library Summary: General-Purpose Utility Library
Group: System/Libraries Group: System/Libraries
Requires: %{name}-branding = %{version} Requires: %{name}-branding = %{version}
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang
Provides: %{name} = %{version} Provides: %{name} = %{version}
Obsoletes: %{name} < %{version} Obsoletes: %{name} < %{version}
# bug437293 # bug437293
@ -266,9 +266,9 @@ NOCONFIGURE=1 ./autogen.sh
%endif %endif
%build %build
#needed by patch0 %if 0%{?suse_version} <= 1140
%if !0%{?BUILD_FROM_VCS} # Needed by patch0
autoreconf -I m4macros autoreconf -fi -I m4macros
%endif %endif
%configure \ %configure \
@ -278,10 +278,7 @@ autoreconf -I m4macros
%if 0%{?with_systemtap} %if 0%{?with_systemtap}
--enable-systemtap \ --enable-systemtap \
%endif %endif
--with-runtime-libdir=../../%{_lib} \ --with-runtime-libdir=../../%{_lib}
#%if 0%{?BUILD_FROM_VCS}
# --enable-gtk-doc
#%endif
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
%if 0%{?BUILD_FROM_VCS} %if 0%{?BUILD_FROM_VCS}
@ -297,7 +294,7 @@ autoreconf -I m4macros
%if 0%{?suse_version} <= 1120 %if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif %endif
%find_lang %{_name}20 %find_lang %{_name}20 %{?no_lang_C}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d
install -D -m0644 glib2.sh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.sh install -D -m0644 glib2.sh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.sh
install -D -m0644 glib2.csh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.csh install -D -m0644 glib2.csh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.csh