From 106d43a3993f14105b813b3a23928ed050ba5c99bdb5a0c22bb5190f7fed318e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 12 Sep 2007 15:01:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=11 --- pidgin.changes | 5 ++ pidgin.spec | 126 +++++-------------------------------------------- 2 files changed, 18 insertions(+), 113 deletions(-) diff --git a/pidgin.changes b/pidgin.changes index 6df925d..31eacb3 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 6 18:56:24 CEST 2007 - sbrabec@suse.cz + +- Dropped gaim-compat package, fixed provides/obsoletes (#296952). + ------------------------------------------------------------------- Fri Aug 17 02:06:21 CEST 2007 - ro@suse.de diff --git a/pidgin.spec b/pidgin.spec index 0111ebe..a35e547 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -13,7 +13,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 2.1.0 -Release: 12 +Release: 27 License: GPL v2 or later Group: Productivity/Networking/Instant Messenger URL: http://www.pidgin.im/ @@ -56,6 +56,13 @@ BuildRequires: fdupes Requires: libpurple-lang = %{version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Existed before 10.3: +Obsoletes: gaim <= 1.5.0 +# Has never been in SuSE: +Obsoletes: gaim-applet +# Was only in the Build Service after 10.2: +Obsoletes: gaim-unstable < 2.0.0 +Provides: gaim %gconf_schemas_prereq @@ -145,13 +152,6 @@ Requires: %{name} = %{version} glib2-devel gtk2-devel libpurple-devel = %{ %package -n libpurple Summary: Library for IM Clients Like Pidgin and Finch Group: Productivity/Networking/Instant Messenger -# Existed before 10.3: -Obsoletes: gaim <= 1.5.0 -Provides: gaim = 1.5.0 -# Has never been in SuSE: -Obsoletes: gaim-applet -# Was only in the Build Service after 10.2: -Obsoletes: gaim-unstable # 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 @@ -163,8 +163,7 @@ Group: Productivity/Networking/Instant Messenger Requires: libpurple = %{version} NetworkManager-devel NetworkManager-glib glib2-devel gnome-keyring-devel libxml2-devel Requires: pkg-config Obsoletes: gaim-devel <= 1.5.0 -Provides: gaim-devel = 1.5.0 -Obsoletes: gaim-unstable-devel +Obsoletes: gaim-unstable-devel < 2.0.0 %package -n libpurple-meanwhile Summary: Lotus Sametime Plugin for Pidgin Using the Meanwhile Library Group: Productivity/Networking/Instant Messenger @@ -177,19 +176,14 @@ Requires: libpurple = %{version} Summary: Text-Based User Interface for Pidgin Instant Messaging Client Group: Productivity/Networking/Instant Messenger Requires: libpurple = %{version} -Obsoletes: gaim-unstable-text +Obsoletes: gaim-unstable-text < 2.0.0 +Provides: gaim-unstable-text %package -n finch-devel Summary: Headers etc. for finch Stuffs Group: Productivity/Networking/Instant Messenger Requires: finch = %{version} glib2-devel glibc-devel libpurple-devel = %{version} ncurses-devel Requires: pkg-config Obsoletes: gaim-unstable-text-devel -%package gaim-compat -Summary: Gaim Compatibility Launchers for Pidgin and Finch -Group: Productivity/Networking/Instant Messenger -Requires: %{name} = %{version} finch = %{version} -Conflicts: gaim < 2.0.0 -Conflicts: gaim-unstable < 2.0.0 %description devel The pidgin-devel package contains the header files, developer @@ -625,77 +619,6 @@ and plugins. -Authors: --------- - Sean Egan - Daniel 'datallah' Atallah - Ethan 'Paco-Paco' Blanton - Thomas Butter - Sadrul Habib Chowdhury - Mark 'KingAnt' Doliner - Christian 'ChipX86' Hammond & Webmaster - Gary 'grim' Kramlich - Richard 'rlaager' Laager - Richard 'wabz' Nelson - Christopher 'siege' O'Brien - Bartosz Oler - Etan 'deryni' Reisner - Tim 'marv' Ringenbach - Luke 'LSchiere' Schierer - Megan 'Cae' Schneider - Evan Schoenberg - Stu 'nosnilmot' Tomlinson - Nathan 'faceprint' Walp - John 'rekkanoryo' Bailey - Ka-Hing 'javabsp' Cheung - Felipe 'shx' Contreras - Decklin Foster - Casey Harkins - Peter 'Bleeter' Lawler - Robert 'Robot101' McQueen - Benjamin Miller - Kevin 'SimGuy' Stange - Herman Bloggs - Jim Duchek - Rob Flynn - Adam Fritzler - Syd Logan - Jim Seymour - Mark Spencer - Eric Warmenhoven - Hylke Bons - Naru Sundar - Peter Teichiman - Larry Ewing - Jeramey A. Crawford - Nathan Walp - Neil Sanchala - Arkadiusz Miskiewicz - David Prater - Sébastien Carp - Ari Pollak - Decklin Foster - David - S D Erle - BMiller - Lance Rocker - ergofobe - Justin M. Ward - G. Sumner Hayes - Brian Ryner - Ryan C. Gordon - Elliot Tobin - Jeroen van der Vegt - The OpenQ Team - - -%description gaim-compat -This package provides compatibility binaries for gaim and gaim-text to -notify users, that they should update their configuration to use new -name. - - - Authors: -------- Sean Egan @@ -820,26 +743,6 @@ test -L $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so && rm $RPM_BUILD_ROOT%{_l test -L $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so && rm $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so #find $RPM_BUILD_ROOT -type f -name .packlist -exec rm {} ';' #find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm {} ';' -# binaries for gaim rename notification: -cat >$RPM_BUILD_ROOT%{_bindir}/gaim <&2 "WARNING: gaim was replaced by pidgin. Please call it as \"pidgin\"." -( -exec 2>/dev/null -zenity --window-icon /usr/share/icons/hicolor/24x24/apps/pidgin.png --warning --text "WARNING: gaim was replaced by pidgin. Please call it as \"pidgin\"." & -KPID=\$! -( sleep 7 ; kill \$KPID ) & -wait \$KPID -) -exec %{_bindir}/pidgin "\$@" -EOF -chmod +x $RPM_BUILD_ROOT%{_bindir}/gaim -cat >$RPM_BUILD_ROOT%{_bindir}/gaim-text <&2 "WARNING: gaim-text was replaced by finch. Please call it as \"finch\"." -exec %{_bindir}/finch "\$@" -EOF -chmod +x $RPM_BUILD_ROOT%{_bindir}/gaim-text %find_lang %{name} rm $RPM_BUILD_ROOT%{_libdir}/*/*.la # NOTE: Original has also "grep -v /libbonjour.so | \" @@ -963,12 +866,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgnt.*a %{_libdir}/pkgconfig/gnt.pc -%files gaim-compat -%defattr(-, root, root) -%{_bindir}/gaim -%{_bindir}/gaim-text - %changelog +* Thu Sep 06 2007 - sbrabec@suse.cz +- Dropped gaim-compat package, fixed provides/obsoletes (#296952). * Fri Aug 17 2007 - ro@suse.de - fix requires: require libpurple-lang instead of pidgin-lang * Tue Aug 14 2007 - maw@suse.de