rpms/gaim-meanwhile/devel gaim-fedora-prefs.xml, NONE, 1.1 gaim2-PIE.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 gaim-meanwhile.spec, 1.13, 1.14 sources, 1.8, 1.9

Joshua W. Boyer (jwboyer) fedora-extras-commits at redhat.com
Thu Jun 29 03:24:21 UTC 2006


Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5730

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Added Files:
	gaim-fedora-prefs.xml gaim2-PIE.patch 
Log Message:
Temporary workaround to fix gaim-meanwhile
for gaim-2.0


--- NEW FILE gaim-fedora-prefs.xml ---
<?xml version='1.0' encoding='UTF-8' ?>

<pref version='1.0' name='/'>
	<pref name='core'>
		<pref name='away'>
			<pref name='away_when_idle' type='bool' value='1' />
			<pref name='mins_before_away' type='int' value='5' />
			<pref name='default_message' type='string' value='Slightly less boring default' />
			<pref name='auto_reply' type='string' value='awayidle' />
		</pref>
		<pref name='buddies'>
			<pref name='use_server_alias' type='bool' value='1' />
		</pref>
		<pref name='contact'>
			<pref name='last_match' type='bool' value='0' />
			<pref name='offline_score' type='int' value='4' />
			<pref name='away_score' type='int' value='2' />
			<pref name='idle_score' type='int' value='1' />
		</pref>
		<pref name='conversations'>
			<pref name='use_alias_for_title' type='bool' value='1' />
			<pref name='chat'>
				<pref name='show_nick_change' type='bool' value='1' />
			</pref>
			<pref name='im'>
				<pref name='send_typing' type='bool' value='1' />
			</pref>
		</pref>
		<pref name='logging'>
			<pref name='log_ims' type='bool' value='1' />
			<pref name='log_chats' type='bool' value='0' />
			<pref name='log_system' type='bool' value='0' />
			<pref name='log_signon_signoff' type='bool' value='0' />
			<pref name='log_idle_state' type='bool' value='0' />
			<pref name='log_away_state' type='bool' value='0' />
			<pref name='log_own_states' type='bool' value='0' />
			<pref name='format' type='string' value='html' />
		</pref>
		<pref name='network'>
			<pref name='auto_ip' type='bool' value='1' />
			<pref name='public_ip' type='string' value='' />
			<pref name='ports_range_use' type='bool' value='0' />
			<pref name='ports_range_start' type='int' value='1024' />
			<pref name='ports_range_end' type='int' value='2048' />
		</pref>
		<pref name='proxy'>
			<pref name='type' type='string' value='none' />
			<pref name='host' type='string' value='' />
			<pref name='port' type='int' value='0' />
			<pref name='username' type='string' value='' />
			<pref name='password' type='string' value='' />
		</pref>
		<pref name='sound'>
			<pref name='while_away' type='bool' value='0' />
		</pref>
	</pref>
	<pref name='plugins'>
		<pref name='core'>
			<pref name='statenotify'>
				<pref name='notify_away' type='bool' value='1' />
				<pref name='notify_idle' type='bool' value='1' />
			</pref>
			<pref name='autorecon'>
				<pref name='hide_connected_error' type='bool' value='0' />
				<pref name='hide_connecting_error' type='bool' value='0' />
				<pref name='restore_state' type='bool' value='1' />
			</pref>
		</pref>
		<pref name='lopl' />
		<pref name='prpl'>
			<pref name='silc'>
				<pref name='sign_im' type='bool' value='0' />
				<pref name='verify_im' type='bool' value='0' />
				<pref name='sign_chat' type='bool' value='0' />
				<pref name='verify_chat' type='bool' value='0' />
				<pref name='vcard' type='string' value='' />
			</pref>
			<pref name='msn'>
				<pref name='conv_close_notice' type='bool' value='1' />
				<pref name='conv_timeout_notice' type='bool' value='1' />
			</pref>
			<pref name='jabber'>
				<pref name='hide_os' type='bool' value='0' />
			</pref>
		</pref>
		<pref name='gtk'>
			<pref name='docklet'>
				<pref name='queue_messages' type='bool' value='0' />
			</pref>
			<pref name='X11'>
				<pref name='gestures'>
					<pref name='visual' type='bool' value='0' />
				</pref>
				<pref name='notify'>
					<pref name='type_im' type='bool' value='1' />
					<pref name='type_chat' type='bool' value='0' />
					<pref name='type_focused' type='bool' value='0' />
					<pref name='method_string' type='bool' value='0' />
					<pref name='title_string' type='string' value='(*)' />
					<pref name='method_urgent' type='bool' value='1' />
					<pref name='method_count' type='bool' value='1' />
					<pref name='notify_focus' type='bool' value='1' />
					<pref name='notify_click' type='bool' value='1' />
					<pref name='notify_type' type='bool' value='1' />
					<pref name='notify_send' type='bool' value='1' />
					<pref name='notify_switch' type='bool' value='1' />
				</pref>
			</pref>
			<pref name='timestamp'>
				<pref name='interval' type='int' value='300000' />
			</pref>
			<pref name='extplacement'>
				<pref name='placement_number' type='int' value='4' />
				<pref name='placement_number_separate' type='bool' value='0' />
			</pref>
		</pref>
	</pref>
	<pref name='gaim'>
		<pref name='gtk'>
			<pref name='accounts'>
				<pref name='dialog'>
					<pref name='width' type='int' value='550' />
					<pref name='height' type='int' value='250' />
				</pref>
			</pref>
			<pref name='away'>
				<pref name='queue_messages' type='bool' value='0' />
			</pref>
			<pref name='browsers'>
				<pref name='place' type='int' value='0' />
				<pref name='command' type='string' value='' />
				<pref name='browser' type='string' value='gnome-open' />
			</pref>
			<pref name='idle'>
				<pref name='reporting_method' type='string' value='system' />
			</pref>
			<pref name='plugins'>
				<pref name='loaded' type='stringlist'>
					<item value='/usr/lib/gaim/autorecon.so' />
					<item value='/usr/lib/gaim/history.so' />
					<item value='/usr/lib/gaim/docklet.so' />
					<item value='/usr/lib/gaim/extplacement.so' />
					<item value='/usr/lib/gaim/notify.so' />
				</pref>
			</pref>
			<pref name='smileys'>
				<pref name='theme' type='string' value='/usr/share/pixmaps/gaim/smileys/default/theme' />
			</pref>
			<pref name='debug'>
				<pref name='enabled' type='bool' value='0' />
				<pref name='timestamps' type='bool' value='0' />
				<pref name='toolbar' type='bool' value='1' />
				<pref name='width' type='int' value='450' />
				<pref name='height' type='int' value='250' />
			</pref>
			<pref name='sound'>
				<pref name='enabled'>
					<pref name='login' type='bool' value='1' />
					<pref name='logout' type='bool' value='1' />
					<pref name='im_recv' type='bool' value='1' />
					<pref name='first_im_recv' type='bool' value='0' />
					<pref name='send_im' type='bool' value='1' />
					<pref name='join_chat' type='bool' value='0' />
					<pref name='left_chat' type='bool' value='0' />
					<pref name='send_chat_msg' type='bool' value='0' />
					<pref name='chat_msg_recv' type='bool' value='0' />
					<pref name='nick_said' type='bool' value='0' />
					<pref name='pounce_default' type='bool' value='1' />
				</pref>
				<pref name='file'>
					<pref name='login' type='string' value='' />
					<pref name='logout' type='string' value='' />
					<pref name='im_recv' type='string' value='' />
					<pref name='first_im_recv' type='string' value='' />
					<pref name='send_im' type='string' value='' />
					<pref name='join_chat' type='string' value='' />
					<pref name='left_chat' type='string' value='' />
					<pref name='send_chat_msg' type='string' value='' />
					<pref name='chat_msg_recv' type='string' value='' />
					<pref name='nick_said' type='string' value='' />
					<pref name='pounce_default' type='string' value='' />
				</pref>
				<pref name='conv_focus' type='bool' value='1' />
				<pref name='command' type='string' value='' />
				<pref name='method' type='string' value='automatic' />
			</pref>
			<pref name='blist'>
				<pref name='auto_expand_contacts' type='bool' value='1' />
				<pref name='button_style' type='int' value='3' />
				<pref name='grey_idle_buddies' type='bool' value='1' />
				<pref name='raise_on_events' type='bool' value='0' />
				<pref name='show_buddy_icons' type='bool' value='0' />
				<pref name='show_empty_groups' type='bool' value='0' />
				<pref name='show_idle_time' type='bool' value='1' />
				<pref name='show_offline_buddies' type='bool' value='0' />
				<pref name='show_warning_level' type='bool' value='1' />
				<pref name='sort_type' type='string' value='alphabetical' />
				<pref name='x' type='int' value='0' />
				<pref name='y' type='int' value='0' />
				<pref name='width' type='int' value='309' />
				<pref name='height' type='int' value='500' />
				<pref name='tooltip_delay' type='int' value='500' />
			</pref>
			<pref name='conversations'>
				<pref name='close_on_tabs' type='bool' value='1' />
				<pref name='ctrl_enter_sends' type='bool' value='0' />
				<pref name='enter_sends' type='bool' value='1' />
				<pref name='escape_closes' type='bool' value='0' />
				<pref name='send_formatting' type='bool' value='0' />
				<pref name='send_bold' type='bool' value='0' />
				<pref name='send_italic' type='bool' value='0' />
				<pref name='send_underline' type='bool' value='0' />
				<pref name='show_timestamps' type='bool' value='1' />
				<pref name='spellcheck' type='bool' value='1' />
				<pref name='ignore_colors' type='bool' value='0' />
				<pref name='ignore_fonts' type='bool' value='0' />
				<pref name='ignore_font_sizes' type='bool' value='0' />
				<pref name='html_shortcuts' type='bool' value='1' />
				<pref name='smiley_shortcuts' type='bool' value='0' />
				<pref name='show_formatting_toolbar' type='bool' value='1' />
				<pref name='passthrough_unknown_commands' type='bool' value='0' />
				<pref name='placement' type='string' value='last' />
				<pref name='placement_number' type='int' value='1' />
				<pref name='bgcolor' type='string' value='' />
				<pref name='fgcolor' type='string' value='' />
				<pref name='font_face' type='string' value='' />
				<pref name='font_size' type='int' value='3' />
				<pref name='tabs' type='bool' value='1' />
				<pref name='tab_side' type='int' value='2' />
				<pref name='button_type' type='int' value='3' />
				<pref name='chat'>
					<pref name='color_nicks' type='bool' value='1' />
					<pref name='default_width' type='int' value='410' />
					<pref name='default_height' type='int' value='160' />
					<pref name='entry_height' type='int' value='50' />
					<pref name='raise_on_events' type='bool' value='0' />
				</pref>
				<pref name='im'>
					<pref name='animate_buddy_icons' type='bool' value='1' />
					<pref name='default_width' type='int' value='410' />
					<pref name='default_height' type='int' value='160' />
					<pref name='entry_height' type='int' value='50' />
					<pref name='raise_on_events' type='bool' value='0' />
					<pref name='show_buddy_icons' type='bool' value='1' />
				</pref>
			</pref>
			<pref name='pounces'>
				<pref name='default_actions'>
					<pref name='open-window' type='bool' value='0' />
					<pref name='popup-notify' type='bool' value='0' />
					<pref name='send-message' type='bool' value='1' />
					<pref name='execute-command' type='bool' value='0' />
					<pref name='play-sound' type='bool' value='0' />
				</pref>
			</pref>
			<pref name='filetransfer'>
				<pref name='clear_finished' type='bool' value='1' />
				<pref name='keep_open' type='bool' value='0' />
			</pref>
		</pref>
	</pref>
</pref>

gaim2-PIE.patch:

--- NEW FILE gaim2-PIE.patch ---
--- gaim-2.0.0beta1/src/Makefile.in.BAD	2006-01-17 15:38:08.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 15:38:39.000000000 -0600
@@ -140,13 +140,13 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CFLAGS) $(CFLAGS) -fPIE
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@ -pie
 SOURCES = $(libgaim_client_la_SOURCES) $(gaim_SOURCES) \
 	$(gaim_client_example_SOURCES)
 DIST_SOURCES = $(am__libgaim_client_la_SOURCES_DIST) \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Jan 2006 14:03:14 -0000	1.8
+++ .cvsignore	29 Jun 2006 03:24:21 -0000	1.9
@@ -1 +1 @@
-gaim-meanwhile-1.2.8.tar.gz
+gaim-2.0.0beta3.tar.bz2


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gaim-meanwhile.spec	15 Feb 2006 12:57:01 -0000	1.13
+++ gaim-meanwhile.spec	29 Jun 2006 03:24:21 -0000	1.14
@@ -1,44 +1,258 @@
-#
-# spec file for gaim-meanwhile - sametime client plugin for gaim
-#
+# OPTION: perl integration (FC1+)
+%define perl_integration	1
+# OPTION: krb5 for Zephyr protocol (FC1+)
+%define krb_integration		1
+# OPTION: gtkspell integration (FC1+)
+%define gtkspell_integration	1
+# OPTION: Preferred Applications with gnome-open (FC1+)
+%define gnome_open_integration	1
+# OPTION: Evolution 1.5+ integration (FC3+)
+%define evolution_integration	1
+# OPTION: SILC integration (FC3+)
+%define silc_integration	1
+# OPTION: Mono integration (FC5+)
+%define mono_integration	0
+# OPTION: dbus integration (FC5+)
+%define dbus_integration	1
+
+# OPTION: Howl integration (seems broken)
+%define howl_integration	0
+# OPTION: gadugadu integration (not shipped in core)
+%define gadugadu_integration	0
+# OPTION: Meanwhile integration (not shipped in core)
+%define meanwhile_integration	1
+
+# Prerelease define
+%define betaver	beta3
 
 Name:		gaim-meanwhile
-Summary:	Lotus Sametime Community Client plugin for Gaim
+Version:	2.0.0
+Release:	0.3.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.8
-Release:	2%{?dist}
-Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
-URL:		http://meanwhile.sourceforge.net
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
-Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
+URL:		http://gaim.sourceforge.net/
+Source0:	http://download.sourceforge.net/gaim/gaim-%{version}%{betaver}.tar.bz2
+Epoch:		2
+
+## Fedora gaim defaults - Please Regenerate for Each Major Release
+# 1) run gaim as new user 2) edit preferences 3) close 4) copy .gaim/prefs.xml
+# - enable System Tray Icon
+# - enable ExtPlacement plugin
+# - enable History plugin
+# - enable Message Notification plugin
+#   Insert count of new messages into window title
+#   Set window manager "URGENT" hint
+# - disable buddy icon in buddy list
+# - enable Logging (in HTML)
+# - Browser "GNOME Default"
+# - Smiley Theme "Default"
+Source1:	gaim-fedora-prefs.xml
+
+## Patches 0-99: Fedora specific or upstream wont accept
+# to be replaced by upstream fix
+Patch5:		gaim2-PIE.patch
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+Summary:	A Gtk+ based multiprotocol instant messaging client
+
+# Require Binary Compatible glib
+# returns bogus value if glib2-devel is not installed in order for parsing to succeed
+# bogus value wont make it into a real package
+%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+BuildRequires:	glib2-devel
+Requires:       glib2 >= %{glib_ver}
+
+# Basic Library Requirements
+BuildRequires:	libao-devel, startup-notification-devel, audiofile-devel
+BuildRequires:  cyrus-sasl-devel
+BuildRequires:	mozilla-nss-devel
+BuildRequires:	gtk2-devel
+BuildRequires:  gettext
+BuildRequires:  libXScrnSaver-devel
+BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
+
+# krb5 needed for Zephyr (FC1+)
+%if %{krb_integration}
+BuildRequires:	krb5-devel
+%endif
+# gtkspell integration (FC1+)
+%if %{gtkspell_integration}
+BuildRequires:	gtkspell-devel, aspell-devel
+%endif
+# Preferred Applications (FC1+)
+%if %{gnome_open_integration}
+Requires:	libgnome
+%else
+Requires:	htmlview
+%endif
+# Evolution integration (FC3+)
+%if %{evolution_integration}
+BuildRequires:	evolution-data-server-devel
+%endif
+# SILC integration (FC3+)
+%if %{silc_integration}
+BuildRequires:	libsilc-devel
+%endif
+# Mono integration (FC5+)
+%if %{mono_integration}
+BuildRequires:	mono-devel
+%endif
+# DBus integration (FC5+)
+%if %{dbus_integration}
+BuildRequires:	dbus-devel >= 0.35
+%endif
+
+# Howl integration (seems to be broken)
+%if %{howl_integration}
+BuildRequires:	avahi-devel
+%endif
+# Meanwhile integration (not shipped in core)
+%if %{meanwhile_integration}
+BuildRequires:	meanwhile-devel
+%endif
+# Gadugadu integration (not shipped in core)
+%if %{gadugadu_integration}
+BuildRequires:	ekg-devel
+%endif
 
 %description
-Gaim plugin to use the meanwhile Lotus Sametime library
+Gaim protocol library to use the meanwhile Lotus Sametime library
 
 %prep
-%setup
+%setup -q -n gaim-%{version}%{betaver}
+%patch5 -p1
+
+# Relabel internal version for support purposes
+sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
+chmod 755 configure
+
+# If not using gnome-open, then default to htmlview 
+cp %{SOURCE1} prefs.xml
+if [ "%{gnome_open_integration}" == "0" ]; then
+	sed -i "s/gnome-open/custom/g" prefs.xml
+	sed -i "s/pref name='command' type='string' value=''/pref name='command' type='string' value='htmlview'/" prefs.xml
+fi
+
+
+
 
 %build
-%configure
-make %{?_smp_mflags}
+%if %{krb_integration}
+	WITH_KRB="--with-krb4"
+%endif
+%if %{silc_integration}
+	WITH_SILC="--with-silc-includes=%{_includedir}/silc --with-silc-libs=%{_libdir}"
+%endif
+%if %{perl_integration}
+	WITH_PERL="--enable-perl"
+%else
+	WITH_PERL="--disable-perl"
+%endif
+%if %{howl_integration}
+	WITH_HOWL="--with-howl-includes=/usr/include/avahi-compat-howl/"
+%endif
+%if %{mono_integration}
+	WITH_MONO="--enable-mono"
+%else
+	WITH_MONO="--disable-mono"
+%endif
+%if %{dbus_integration}
+	WITH_DBUS="--enable-dbus"
+%else
+	WITH_DBUS="--disable-dbus"
+%endif
+
+
+# FC5+ automatic -fstack-protector-all switch
+export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
+export CFLAGS="$RPM_OPT_FLAGS"
+
+# disable tcl and tk because nobody uses it
+# gnutls is buggy so use mozilla-nss on all distributions
+%configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes \
+           --enable-cyrus-sasl \
+	   $WITH_KRB $WITH_SILC $WITH_PERL $WITH_HOWL $WITH_MONO \
+	   $WITH_SASL $WITH_DBUS
+# smp_mflags breaks the mono plugin
+make
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{makeinstall}
+make DESTDIR=$RPM_BUILD_ROOT install
+
+# remove libtool libraries and static libraries
+rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
+# remove the old perllocal.pod file
+rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+# remove relnot.so plugin since it is unusable for our package
+rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/relnot.so
+
+# remove everything except the meanwhile parts
+rm -rf $RPM_BUILD_ROOT%{_bindir}
+rm -rf $RPM_BUILD_ROOT%{_includedir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgaim*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/perl5
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/bin
+rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/perl5
+rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/libgaim*
+rm -rf $RPM_BUILD_ROOT%{_datadir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/src
+
+#preserve the libsametime debug libraries and delete the rest
+#mv $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/libsametime.so.debug $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/sametime.tmp
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/*.so
+#mv $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/sametime.tmp $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/libsametime.so
+
+# preserve the libsametime libraries and delete the rest
+mv $RPM_BUILD_ROOT%{_libdir}/gaim/libsametime.so $RPM_BUILD_ROOT%{_libdir}/gaim/sametime.tmp
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gaim/*.so
+mv $RPM_BUILD_ROOT%{_libdir}/gaim/sametime.tmp $RPM_BUILD_ROOT%{_libdir}/gaim/libsametime.so
+
+
+%if %{perl_integration}
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
+%endif
+
+# make sure that we can write to all the files we've installed
+# so that they are properly stripped
+chmod -R u+w $RPM_BUILD_ROOT/*
+
+#%find_lang gaim
+
+
+%post 
+/sbin/ldconfig -n %{_libdir}/gaim
+# This is a hack that we have to do. Mono apps need mono_exec_t. Since gaim doesn't 
+# call /usr/bin/mono to run its mono bits, the existing selinux policy misses this.
+#/usr/bin/chcon -t mono_exec_t /usr/bin/gaim 
+
+# XXX: This line above fails on non-selinux systems with a non-zero return code.
+# Changing the selinux context here would also cause rpm -V and TPS failure.
+# Can't we find a better solution for this?
+
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196877
+# There is also concern that we don't want gaim to run with this security context
+# due to its historical security track record.  For now we are disaling mono
+# temporarily until we decide a long term solution.
+
+%postun
+/sbin/ldconfig -n %{_libdir}/gaim
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING README
-%{_libdir}/gaim/libmwgaim.so
-%exclude %{_libdir}/gaim/libmwgaim.la
-%{_datadir}/pixmaps/gaim/
+%defattr(-,root,root,-)
+%{_libdir}/gaim/
 
 %changelog
+* Wed Jun 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.3.beta3
+- Temporarily build all of gaim and only install the libsametime.so library
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 1.2.8-2
 - Bump release for FE5 rebuild
 
@@ -87,3 +301,4 @@
 
 * Tue May 23 2005 - jwboyer at jdub.homelinux.org 1.2.2-1
 - Initial package, adapted from spec file by Dag Wieers
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Jan 2006 14:03:14 -0000	1.8
+++ sources	29 Jun 2006 03:24:21 -0000	1.9
@@ -1 +1 @@
-da891cb5304776ace34ce63c7f666172  gaim-meanwhile-1.2.8.tar.gz
+c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2




More information about the fedora-extras-commits mailing list