Mercurial > pidgin
comparison pidgin.spec.in @ 30877:23be655cc688
propagate from branch 'im.pidgin.cpw.qulogic.msnp16' (head a27b68b2e6653e6b96aa0279bd649181c89b20ed)
to branch 'im.pidgin.soc.2010.msn-tlc' (head 20ad1c813e2b512df4a065dda88f3cfa732463a3)
| author | masca@cpw.pidgin.im |
|---|---|
| date | Wed, 15 Sep 2010 17:34:21 +0000 |
| parents | 75460aee9279 |
| children | be7aa3af4b3a |
comparison
equal
deleted
inserted
replaced
| 30873:4b1eecab50e8 | 30877:23be655cc688 |
|---|---|
| 44 %{!?_without_gevolution:BuildRequires: evolution-data-server-devel} | 44 %{!?_without_gevolution:BuildRequires: evolution-data-server-devel} |
| 45 | 45 |
| 46 %if "%{_vendor}" == "suse" | 46 %if "%{_vendor}" == "suse" |
| 47 # For SuSE: | 47 # For SuSE: |
| 48 BuildRequires: gnutls-devel | 48 BuildRequires: gnutls-devel |
| 49 %define sslopts "--enable-gnutls=yes --enable-nss=no" | |
| 49 %{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35} | 50 %{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35} |
| 50 %{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10} | 51 %{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10} |
| 51 Requires(pre): gconf2 | 52 Requires(pre): gconf2 |
| 52 Requires(post): gconf2 | 53 Requires(post): gconf2 |
| 53 Requires(preun): gconf2 | 54 Requires(preun): gconf2 |
| 54 %else | 55 %else |
| 56 %define sslopts "--enable-gnutls=no --enable-nss=yes" | |
| 55 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35} | 57 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35} |
| 56 %{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10} | 58 %{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10} |
| 57 Requires(pre): GConf2 | 59 Requires(pre): GConf2 |
| 58 Requires(post): GConf2 | 60 Requires(post): GConf2 |
| 59 Requires(preun): GConf2 | 61 Requires(preun): GConf2 |
| 228 --includedir=%{_includedir} \ | 230 --includedir=%{_includedir} \ |
| 229 --libdir=%{_libdir} \ | 231 --libdir=%{_libdir} \ |
| 230 --mandir=%{_mandir} \ | 232 --mandir=%{_mandir} \ |
| 231 --sysconfdir=%{_sysconfdir} \ | 233 --sysconfdir=%{_sysconfdir} \ |
| 232 --disable-schemas-install \ | 234 --disable-schemas-install \ |
| 235 %{sslopts} \ | |
| 233 %{!?_with_vv:--disable-vv} \ | 236 %{!?_with_vv:--disable-vv} \ |
| 234 %{!?_with_dbus:--disable-dbus} \ | 237 %{!?_with_dbus:--disable-dbus} \ |
| 235 %{!?_with_avahi:--disable-avahi} \ | 238 %{!?_with_avahi:--disable-avahi} \ |
| 236 %{!?_with_meanwhile:--disable-meanwhile} \ | 239 %{!?_with_meanwhile:--disable-meanwhile} \ |
| 237 %{?_without_gstreamer:--disable-gstreamer} \ | 240 %{?_without_gstreamer:--disable-gstreamer} \ |
| 469 %{_libdir}/libgnt.so | 472 %{_libdir}/libgnt.so |
| 470 | 473 |
| 471 %endif | 474 %endif |
| 472 | 475 |
| 473 %changelog | 476 %changelog |
| 477 * Wed Sep 01 2010 Stu Tomlinson <stu@nosnilmot.com> | |
| 478 - Ensure predictable use of SSL libs | |
| 479 | |
| 474 * Wed Jun 02 2010 Stu Tomlinson <stu@nosnilmot.com> | 480 * Wed Jun 02 2010 Stu Tomlinson <stu@nosnilmot.com> |
| 475 - add an option to build RPMs using --enable-trayicon-compat | 481 - add an option to build RPMs using --enable-trayicon-compat |
| 476 (--with trayiconcompat) | 482 (--with trayiconcompat) |
| 477 | 483 |
| 478 * Thu May 13 2010 Stu Tomlinson <stu@nosnilmot.com> | 484 * Thu May 13 2010 Stu Tomlinson <stu@nosnilmot.com> |