From 26f808042cfd308f15c74dfc1ae7187eed3fdbb3ab2c0a92bd47f9a63c98bc95 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 25 Oct 2007 00:40:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=15 --- pidgin.changes | 5 +++++ pidgin.spec | 34 ++++++++++------------------------ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/pidgin.changes b/pidgin.changes index 228b399..1a7df61 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 24 18:14:52 CEST 2007 - sbrabec@suse.cz + +- Fixed build by providing of lang package in older products. + ------------------------------------------------------------------- Tue Oct 23 18:22:05 CEST 2007 - sbrabec@suse.cz diff --git a/pidgin.spec b/pidgin.spec index 2498637..6234d61 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -13,7 +13,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 2.1.1 -Release: 29 +Release: 31 License: GPL v2 or later Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -51,8 +51,8 @@ BuildRequires: dbus-1-glib %if %suse_version >= 1021 || 0%{?opensuse_bs} BuildRequires: avahi-compat-howl-devel silc-toolkit-devel BuildRequires: fdupes -Requires: libpurple-lang = %{version} %endif +Requires: libpurple-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build # Existed before 10.3: Obsoletes: gaim <= 1.5.0 @@ -152,9 +152,7 @@ Summary: Library for IM Clients Like Pidgin and Finch Group: Productivity/Networking/Instant Messenger # Not really required, but standard Jabber accounts require it, if compiled with SASL support. Requires: cyrus-sasl-digestmd5 cyrus-sasl-plain -%if %suse_version > 1020 Requires: libpurple-lang = %{version} -%endif # Needed for purple-url-handler: Requires: dbus-1-python @@ -756,11 +754,6 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \ sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-finchplugins %find_gconf_schemas cat %{name}.schemas_list %{name}-%{version}-pidginplugins >%{name}.lst -%if %suse_version > 1020 -cat %{name}-%{version}-purpleplugins >libpurple.lst -%else -cat %{name}.lang %{name}-%{version}-purpleplugins >libpurple.lst -%endif # pointless libtool .la file with only trivial dependencies rm $RPM_BUILD_ROOT%{_libdir}/libpurple.la $RPM_BUILD_ROOT%{_libdir}/libpurple-client.la %fdupes $RPM_BUILD_ROOT @@ -773,17 +766,13 @@ rm -rf $RPM_BUILD_ROOT %preun -f %{name}.schemas_preun -%post -n libpurple -/sbin/ldconfig +%post -n libpurple -p /sbin/ldconfig -%postun -n libpurple -/sbin/ldconfig +%postun -n libpurple -p /sbin/ldconfig -%post -n finch -/sbin/ldconfig +%post -n finch -p /sbin/ldconfig -%postun -n finch -/sbin/ldconfig +%postun -n finch -p /sbin/ldconfig %files -f %{name}.lst %defattr(-,root,root) @@ -805,15 +794,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_includedir}/pidgin %{_libdir}/pkgconfig/pidgin.pc -%if %suse_version > 1020 %files -n libpurple-lang -f %{name}.lang -%files -n libpurple -f libpurple.lst -%else - -%files -f libpurple.lst -n libpurple -%endif +%files -n libpurple -f %{name}-%{version}-purpleplugins %defattr(-, root, root) %doc libpurple/purple-notifications-example %{_bindir}/purple-client-example @@ -847,7 +831,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/purple.pc %doc %{_mandir}/man3/Purple.* -%files -f %{name}-%{version}-finchplugins -n finch +%files -n finch -f %{name}-%{version}-finchplugins %defattr(-, root, root) %{_bindir}/finch %{_libdir}/libgnt.so.* @@ -863,6 +847,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgnt.*a %{_libdir}/pkgconfig/gnt.pc %changelog +* Wed Oct 24 2007 - sbrabec@suse.cz +- Fixed build by providing of lang package in older products. * Tue Oct 23 2007 - sbrabec@suse.cz - Fixed BuildRequires in Build Service. * Mon Oct 01 2007 - sbrabec@suse.cz