Attachment 591286 Details for Bug 831364 – spec patch

[patch] spec patch

pidgin.diff (text/plain), 5.04 KB, created by Bill Nottingham on 2012-06-12 21:08:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2012-06-12 21:08:46 UTC

Size: 5.04 KB

patch

obsolete

>diff --git a/pidgin.spec b/pidgin.spec
>index 158d559..3e9399e 100644
>--- a/pidgin.spec
>+++ b/pidgin.spec
>@@ -44,6 +44,7 @@
> %global split_evolution         0
> %global use_system_certs        0
> %global use_system_libgadu      0
>+%global build_only_libs         0
> 
> # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
> %if 0%{?fedora} < 5
>@@ -93,7 +94,7 @@
> # EL6: Disable SILC protocol
> # (get rid of extra crypto lib for perpetually broken protocol that nobody uses)
> # (the above comment is not necessarily the view held by all maintaners of this package)
>-%if 0%{?rhel} == 6
>+%if 0%{?rhel} >= 6
> %global disable_silc            1
> %endif
> # F13+ Split Evolution plugin to separate package (#581144)
>@@ -104,6 +105,10 @@
> %if 0%{?fedora} >= 16
> %global use_system_libgadu      1
> %endif
>+%if 0%{?rhel} >= 7
>+%global build_only_libs         1
>+%global api_docs                0
>+%endif
> 
> Name:           pidgin
> Version:        2.10.4
>@@ -166,18 +171,26 @@ Requires(preun): GConf2
> # Basic Library Requirements
> BuildRequires:  autoconf
> BuildRequires:  libtool
>-BuildRequires:  startup-notification-devel
> BuildRequires:  cyrus-sasl-devel
> %if %{nss_md2_disabled}
> BuildRequires:  nss-devel >= 3.12.3
> %else
> BuildRequires:  nss-devel
> %endif
>+
>+%if ! %{build_only_libs}
>+BuildRequires:  startup-notification-devel
> BuildRequires:  gtk2-devel
>-BuildRequires:  gettext
>-BuildRequires:  intltool
> BuildRequires:  desktop-file-utils
> BuildRequires:  ncurses-devel
>+# gtkspell integration (FC1+)
>+BuildRequires:  gtkspell-devel
>+# Evolution integration (FC3+)
>+BuildRequires:  evolution-data-server-devel
>+%endif
>+
>+BuildRequires:  gettext
>+BuildRequires:  intltool
> BuildRequires:  tcl-devel
> BuildRequires:  tk-devel
> BuildRequires:  libxml2-devel
>@@ -186,10 +199,6 @@ BuildRequires:  libxml2-devel
> # krb5 needed for Zephyr (FC1+)
> BuildRequires:  krb5-devel
> %endif
>-# gtkspell integration (FC1+)
>-BuildRequires:  gtkspell-devel
>-# Evolution integration (FC3+)
>-BuildRequires:  evolution-data-server-devel
> # SILC integration (FC3+)
> %if ! %{disable_silc}
> BuildRequires:  libsilc-devel
>@@ -494,6 +503,9 @@ SWITCHES="--with-extraversion=%{release}"
> %if %{use_system_certs}
>     SWITCHES="$SWITCHES --with-system-ssl-certs=/etc/pki/tls/certs"
> %endif
>+%if %{build_only_libs}
>+    SWITCHES="$SWITCHES --disable-consoleui --disable-gtkui"
>+%endif
> 
> # FC5+ automatic -fstack-protector-all switch
> export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
>@@ -522,10 +534,12 @@ make DESTDIR=$RPM_BUILD_ROOT install LIBTOOL=/usr/bin/libtool
> 
> install -m 0755 libpurple/plugins/one_time_password.so $RPM_BUILD_ROOT%{_libdir}/purple-2/
> 
>+%if ! %{build_only_libs}
> desktop-file-install --vendor pidgin --delete-original              \
>                      --add-category X-Red-Hat-Base                  \
>                      --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
>                      $RPM_BUILD_ROOT%{_datadir}/applications/pidgin.desktop
>+%endif
> 
> # remove libtool libraries and static libraries
> find $RPM_BUILD_ROOT $ -name "*.la" -o -name "*.a" $ -exec rm -f {} ';'
>@@ -552,8 +566,10 @@ chmod -R u+w $RPM_BUILD_ROOT/*
> 
> %find_lang pidgin
> 
>+%if ! %{build_only_libs}
> # symlink /usr/bin/gaim to new pidgin name
> ln -sf pidgin $RPM_BUILD_ROOT%{_bindir}/gaim
>+%endif
> 
> %if %{api_docs}
> rm -rf html
>@@ -564,6 +580,11 @@ ln -sf ../../doc/pidgin-docs-%{version}/html/ \
>     $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/pidgin
> %endif
> 
>+%if %{build_only_libs}
>+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/purple.schemas
>+%endif
>+
>+%if ! %{build_only_libs}
> %pre
> if [ "$1" -gt 1 ]; then
>     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
>@@ -581,10 +602,12 @@ gconftool-2 --makefile-install-rule \
>     %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
> killall -HUP gconfd-2 &> /dev/null || :
> 
>-%post -n libpurple -p /sbin/ldconfig
>-
> %post -n finch -p /sbin/ldconfig
>+%endif
> 
>+%post -n libpurple -p /sbin/ldconfig
>+
>+%if ! %{build_only_libs}
> %preun
> if [ "$1" -eq 0 ]; then
>     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
>@@ -598,13 +621,15 @@ touch --no-create %{_datadir}/icons/hicolor || :
> [ -x %{_bindir}/gtk-update-icon-cache ] && \
> %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
> 
>-%postun -n libpurple -p /sbin/ldconfig
>-
> %postun -n finch -p /sbin/ldconfig
>+%endif
>+
>+%postun -n libpurple -p /sbin/ldconfig
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>+%if ! %{build_only_libs}
> %files
> %defattr(-,root,root,-)
> %doc NEWS COPYING AUTHORS README ChangeLog doc/PERL-HOWTO.dox
>@@ -636,6 +661,7 @@ rm -rf $RPM_BUILD_ROOT
> %defattr(-,root,root,-)
> %{_includedir}/pidgin/
> %{_libdir}/pkgconfig/pidgin.pc
>+%endif
> 
> %files -f pidgin.lang -n libpurple
> %defattr(-,root,root,-)
>@@ -681,6 +707,7 @@ rm -rf $RPM_BUILD_ROOT
> %defattr(-,root,root,-)
> %{_libdir}/purple-2/tcl.so
> 
>+%if ! %{build_only_libs}
> %files -n finch
> %defattr(-,root,root,-)
> %{_bindir}/finch
>@@ -696,6 +723,7 @@ rm -rf $RPM_BUILD_ROOT
> %{_libdir}/libgnt.so
> %{_libdir}/pkgconfig/gnt.pc
> %{_libdir}/pkgconfig/finch.pc
>+%endif
> 
> %if %{api_docs}
> %files -n pidgin-docs

Actions: View | Diff

Attachments on bug 831364: 591286