Attachment 651880 Details for Bug 880132 – spec cleanup for recent packaging guidelines

[patch] spec cleanup for recent packaging guidelines

ibus-cleanup.patch (text/plain), 4.09 KB, created by Parag Nemade on 2012-11-26 10:38:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Parag Nemade

Created: 2012-11-26 10:38:20 UTC

Size: 4.09 KB

patch

obsolete

>diff --git a/ibus.spec b/ibus.spec
>index cf13211..bf36618 100644
>--- a/ibus.spec
>+++ b/ibus.spec
>@@ -1,27 +1,26 @@
>-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
>-%{!?gtk2_binary_version: %define gtk2_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
>-%{!?gtk3_binary_version: %define gtk3_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-3.0)}
>+%{!?gtk2_binary_version: %global gtk2_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
>+%{!?gtk3_binary_version: %global gtk3_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-3.0)}
> 
>-%define with_xkbfile 1
>-%define with_pygobject2 1
>-%define with_pygobject3 1
>+%global with_xkbfile 1
>+%global with_pygobject2 1
>+%global with_pygobject3 1
> 
> %if (0%{?fedora} > 17 || 0%{?rhel} > 6)
> #ifarch ppc ppc64 s390 s390x
>-%define with_gjs 0
>+%global with_gjs 0
> %else
>-%define with_gjs 1
>+%global with_gjs 1
> %endif
> 
>-%define ibus_gjs_version 3.4.1.20120815
>-%define ibus_gjs_build_failure 1
>+%global ibus_gjs_version 3.4.1.20120815
>+%global ibus_gjs_build_failure 1
> 
>-%define ibus_api_version 1.0
>+%global ibus_api_version 1.0
> 
>-%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
>-%define dbus_python_version 0.83.0
>+%global glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
>+%global dbus_python_version 0.83.0
> # FIXME: It's better to use the new icon names
>-%define gnome_icon_theme_legacy_version 2.91.6
>+%global gnome_icon_theme_legacy_version 2.91.6
> 
> Name:       ibus
> Version:    1.4.99.20121109
>@@ -54,7 +53,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  gettext-devel
> BuildRequires:  libtool
>-BuildRequires:  python
>+BuildRequires:  python2-devel
> BuildRequires:  gtk2-devel
> BuildRequires:  gtk3-devel
> BuildRequires:  dbus-glib-devel
>@@ -121,7 +120,7 @@ Requires(posttrans): dconf
> Requires(post):  %{_sbindir}/alternatives
> Requires(postun):  %{_sbindir}/alternatives
> 
>-%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
>+%global _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
> 
> %description
> IBus means Intelligent Input Bus. It is an input framework for Linux OS.
>@@ -284,6 +283,7 @@ echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desk
> echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
> rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
> rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ibus.desktop
>+
> # workaround for desktop-file-install
> sed -i -e 's|Comment\[ja\]=IBus |& |' \
>   $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
>@@ -295,7 +295,7 @@ desktop-file-install --delete-original          \
> # https://bugzilla.redhat.com/show_bug.cgi?id=657165
> d=`basename %SOURCE2 .tar.gz`
> cd $d
>-make DESTDIR=$RPM_BUILD_ROOT install
>+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
> rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/ibus-gjs.mo
> cd ..
> %endif
>@@ -337,16 +337,23 @@ dconf update
> %postun libs -p /sbin/ldconfig
> 
> %post gtk2
>-%{_bindir}/update-gtk-immodules %{_host} || :
>+if [ $1 -eq 1 ] ; then
>+    # For upgrades, the cache will be regenerated by the new package's %postun
>+    /usr/bin/gtk-query-immodules-2.0-%{__isa_bits} --update-cache &> /dev/null || :
>+fi
> 
> %postun gtk2
>-%{_bindir}/update-gtk-immodules %{_host} || :
>+/usr/bin/gtk-query-immodules-2.0-%{__isa_bits} --update-cache &> /dev/null || :
> 
> %post gtk3
>-%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || :
>+if [ $1 -eq 1 ] ; then
>+    # For upgrades, the cache will be regenerated by the new package's %postun
>+    /usr/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache &> /dev/null || :
>+fi
> 
> %postun gtk3
>-%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || :
>+/usr/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache &> /dev/null || :
>+
> 
> # FIXME: no version number
> %files -f %{name}10.lang

Actions: View | Diff

Attachments on bug 880132: 651880