rpms/xchat-gnome/devel xchat-gnome-config.patch, NONE, 1.1 xchat-gnome-datadir.patch, NONE, 1.1 xchat-gnome.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Sat Nov 12 14:46:01 UTC 2005 

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30118/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xchat-gnome-config.patch xchat-gnome-datadir.patch 
	xchat-gnome.spec 
Log Message:
auto-import xchat-gnome-0.6-4 on branch devel from xchat-gnome-0.6-4.src.rpm

xchat-gnome-config.patch:

--- NEW FILE xchat-gnome-config.patch ---
diff -ur xchat-gnome-0.6.OLD/src/common/cfgfiles.c xchat-gnome-0.6/src/common/cfgfiles.c
--- xchat-gnome-0.6.OLD/src/common/cfgfiles.c	2005-10-23 23:13:22.000000000 -0400
+++ xchat-gnome-0.6/src/common/cfgfiles.c	2005-11-12 00:14:51.000000000 -0500
@@ -34,7 +34,7 @@
 #ifdef WIN32
 #define XCHAT_DIR "X-Chat 2"
 #else
-#define XCHAT_DIR ".xchat2"
+#define XCHAT_DIR ".xchat-gnome"
 #endif
 #define DEF_FONT "Monospace 9"
 

xchat-gnome-datadir.patch:

--- NEW FILE xchat-gnome-datadir.patch ---
diff -ur xchat-gnome-0.6.OLD/configure xchat-gnome-0.6/configure
--- xchat-gnome-0.6.OLD/configure	2005-10-23 23:19:45.000000000 -0400
+++ xchat-gnome-0.6/configure	2005-10-26 02:18:28.000000000 -0400
@@ -31941,19 +31941,19 @@
 _ACEOF
 
 
-XCHATLIBDIR=`eval echo ${libdir}/xchat`
+XCHATLIBDIR=`eval echo ${libdir}/xchat-gnome`
 cat >>confdefs.h <<_ACEOF
 #define XCHATLIBDIR "$XCHATLIBDIR"
 _ACEOF
 
 
-XCHATSHAREDIR=`eval echo ${datadir}/xchat`
+XCHATSHAREDIR=`eval echo ${datadir}/xchat-gnome`
 cat >>confdefs.h <<_ACEOF
 #define XCHATSHAREDIR "$XCHATSHAREDIR"
 _ACEOF
 
 
-xchatlibdir=${libdir}/xchat
+xchatlibdir=${libdir}/xchat-gnome
 
 
                                                                                                                                                                           ac_config_files="$ac_config_files Makefile src/Makefile src/common/Makefile src/fe-text/Makefile src/fe-gnome/Makefile src/fe-gnome/data/Makefile src/fe-gtk/Makefile src/pixmaps/Makefile plugins/Makefile plugins/python/Makefile plugins/perl/Makefile plugins/tcl/Makefile plugins/url_scraper/Makefile plugins/notification/Makefile plugins/dbus/Makefile intl/Makefile po/Makefile.in"
diff -ur xchat-gnome-0.6.OLD/configure.in xchat-gnome-0.6/configure.in
--- xchat-gnome-0.6.OLD/configure.in	2005-10-23 23:05:56.000000000 -0400
+++ xchat-gnome-0.6/configure.in	2005-10-26 02:17:27.000000000 -0400
@@ -753,14 +753,14 @@
 
 AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
 
-XCHATLIBDIR=`eval echo ${libdir}/xchat`
+XCHATLIBDIR=`eval echo ${libdir}/xchat-gnome`
 AC_DEFINE_UNQUOTED(XCHATLIBDIR, "$XCHATLIBDIR")
 
-XCHATSHAREDIR=`eval echo ${datadir}/xchat`
+XCHATSHAREDIR=`eval echo ${datadir}/xchat-gnome`
 AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "$XCHATSHAREDIR")
 
 dnl for plugins/xxx/Makefile.am
-xchatlibdir=${libdir}/xchat
+xchatlibdir=${libdir}/xchat-gnome
 AC_SUBST(xchatlibdir)
 
 AC_OUTPUT([
diff -ur xchat-gnome-0.6.OLD/plugins/notification/Makefile.am xchat-gnome-0.6/plugins/notification/Makefile.am
--- xchat-gnome-0.6.OLD/plugins/notification/Makefile.am	2005-10-19 13:33:12.000000000 -0400
+++ xchat-gnome-0.6/plugins/notification/Makefile.am	2005-10-26 02:45:54.000000000 -0400
@@ -26,4 +26,4 @@
 		   -I$(srcdir)/.. \
 		   -I$(top_srcdir)/src/fe-gnome \
 		   -DEGG_COMPILATION \
-		   -DXCHATSHAREDIR="\"$(datadir)/xchat\""
+		   -DXCHATSHAREDIR="\"$(datadir)/xchat-gnome\""
diff -ur xchat-gnome-0.6.OLD/plugins/notification/Makefile.in xchat-gnome-0.6/plugins/notification/Makefile.in
--- xchat-gnome-0.6.OLD/plugins/notification/Makefile.in	2005-10-23 23:19:40.000000000 -0400
+++ xchat-gnome-0.6/plugins/notification/Makefile.in	2005-10-26 02:46:14.000000000 -0400
@@ -284,7 +284,7 @@
 		   -I$(srcdir)/.. \
 		   -I$(top_srcdir)/src/fe-gnome \
 		   -DEGG_COMPILATION \
-		   -DXCHATSHAREDIR="\"$(datadir)/xchat\""
+		   -DXCHATSHAREDIR="\"$(datadir)/xchat-gnome\""
 
 all: all-am
 
diff -ur xchat-gnome-0.6.OLD/src/fe-gnome/data/Makefile.am xchat-gnome-0.6/src/fe-gnome/data/Makefile.am
--- xchat-gnome-0.6.OLD/src/fe-gnome/data/Makefile.am	2005-10-19 13:33:17.000000000 -0400
+++ xchat-gnome-0.6/src/fe-gnome/data/Makefile.am	2005-10-26 02:41:07.000000000 -0400
@@ -13,7 +13,7 @@
 	stock_up.png			\
 	toilet-paper.png		\
 	xchat-gnome-small.png
-xchat_gnomedir = $(datadir)/xchat
+xchat_gnomedir = $(datadir)/xchat-gnome
 
 icondir = $(datadir)/pixmaps
 icon_DATA = xchat-gnome.png
diff -ur xchat-gnome-0.6.OLD/src/fe-gnome/data/Makefile.in xchat-gnome-0.6/src/fe-gnome/data/Makefile.in
--- xchat-gnome-0.6.OLD/src/fe-gnome/data/Makefile.in	2005-10-23 23:19:42.000000000 -0400
+++ xchat-gnome-0.6/src/fe-gnome/data/Makefile.in	2005-10-26 02:41:40.000000000 -0400
@@ -265,7 +265,7 @@
 	toilet-paper.png		\
 	xchat-gnome-small.png
 
-xchat_gnomedir = $(datadir)/xchat
+xchat_gnomedir = $(datadir)/xchat-gnome
 icondir = $(datadir)/pixmaps
 icon_DATA = xchat-gnome.png
 EXTRA_DIST = $(xchat_gnome_DATA) $(icon_DATA)
diff -ur xchat-gnome-0.6.OLD/src/fe-gnome/Makefile.am xchat-gnome-0.6/src/fe-gnome/Makefile.am
--- xchat-gnome-0.6.OLD/src/fe-gnome/Makefile.am	2005-10-19 13:33:19.000000000 -0400
+++ xchat-gnome-0.6/src/fe-gnome/Makefile.am	2005-10-26 02:51:07.000000000 -0400
@@ -1,6 +1,6 @@
 bin_PROGRAMS = xchat-gnome
 
-xchat_gnomedir = $(datadir)/xchat
+xchat_gnomedir = $(datadir)/xchat-gnome
 INCLUDES =					\
 	$(GUI_CFLAGS)				\
 	$(LIBSEXY_CFLAGS)			\
diff -ur xchat-gnome-0.6.OLD/src/fe-gnome/Makefile.in xchat-gnome-0.6/src/fe-gnome/Makefile.in
--- xchat-gnome-0.6.OLD/src/fe-gnome/Makefile.in	2005-10-23 23:19:42.000000000 -0400
+++ xchat-gnome-0.6/src/fe-gnome/Makefile.in	2005-10-26 02:51:35.000000000 -0400
@@ -319,7 +319,7 @@
 target_alias = @target_alias@
 unamepath = @unamepath@
 xchatlibdir = @xchatlibdir@
-xchat_gnomedir = $(datadir)/xchat
+xchat_gnomedir = $(datadir)/xchat-gnome
 INCLUDES = \
 	$(GUI_CFLAGS)				\
 	$(LIBSEXY_CFLAGS)			\
diff -ur xchat-gnome-0.6.OLD/src/pixmaps/Makefile.am xchat-gnome-0.6/src/pixmaps/Makefile.am
--- xchat-gnome-0.6.OLD/src/pixmaps/Makefile.am	2005-10-19 13:33:09.000000000 -0400
+++ xchat-gnome-0.6/src/pixmaps/Makefile.am	2005-10-26 02:35:04.000000000 -0400
@@ -13,7 +13,7 @@
 CLEANFILES = $(noinst_HEADERS)
 EXTRA_DIST = $(PNGS) makefile.msc
 
-xchatdatadir = $(prefix)/share/xchat
+xchatdatadir = $(prefix)/share/xchat-gnome
 xchatdata_DATA = $(PNGS)
 
 inline_pngs.h:
diff -ur xchat-gnome-0.6.OLD/src/pixmaps/Makefile.in xchat-gnome-0.6/src/pixmaps/Makefile.in
--- xchat-gnome-0.6.OLD/src/pixmaps/Makefile.in	2005-10-23 23:19:43.000000000 -0400
+++ xchat-gnome-0.6/src/pixmaps/Makefile.in	2005-10-26 02:35:40.000000000 -0400
@@ -265,7 +265,7 @@
 noinst_HEADERS = inline_pngs.h
 CLEANFILES = $(noinst_HEADERS)
 EXTRA_DIST = $(PNGS) makefile.msc
-xchatdatadir = $(prefix)/share/xchat
+xchatdatadir = $(prefix)/share/xchat-gnome
 xchatdata_DATA = $(PNGS)
 all: all-am
 


--- NEW FILE xchat-gnome.spec ---
%define with_dbus 0

Name:           xchat-gnome
Version:        0.6
Release:        4
Summary:        GNOME front-end to xchat

Group:          Applications/Internet
License:        GPL
URL:            http://%{name}.navi.cx/
Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0:		%{name}-datadir.patch
Patch1:		%{name}-config.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	openssl-devel
Buildrequires:	libsexy-devel
BuildRequires:	libgnomeui-devel
BuildRequires:	libglade2-devel
BuildRequires:	python-devel
BuildRequires:	desktop-file-utils
BuildRequires:  gettext

%if %{with_dbus}
BuildRequires:	dbus-devel
%endif

Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2


%description
xchat-gnome is a new frontend for the popular X-Chat IRC client.  GNOME's
philosophy in terms of user interfaces has been progressing towards
presenting the user with few options, yet sane defaults. While many of the
normal X-Chat options will be preserved inside GConf, only the most
common settings will be included in the main user interface. .


%prep
%setup -q
%patch0 -p1 -b .datadir
%patch1 -p1 -b .config


%build
%configure --disable-gtkfe	\
	   --disable-tcl	\
	   --enable-ipv6	\
	   --enable-shm		\
%if %{with_dbus}
	   --enable-dbus	
%else
	   --disable-dbus
%endif

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la

desktop-file-install --vendor fedora --delete-original	\
	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
	--add-category X-Fedora				\
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

# Remove duplicate files from xchat package.
rm $RPM_BUILD_ROOT%{_datadir}/applications/xchat.desktop
rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/xchat.png


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
    	gconftool-2 --makefile-uninstall-rule \
      	    %{_sysconfdir}/gconf/schemas/$i >/dev/null || :
    done
    killall -HUP gconfd-2 || :
fi


%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
	gconftool-2 --makefile-install-rule \
		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
done
killall -HUP gconfd-2 || :


%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
    	gconftool-2 --makefile-uninstall-rule \
      		%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
    done
    killall -HUP gconfd-2 || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING faq.html README plugins/plugin20.html
%doc plugins/perl/xchat2-perldocs.html
%{_bindir}/%{name}
%{_sysconfdir}/gconf/schemas/*.schemas
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/plugins/
%if %{with_dbus}
%{_bindir}/xchat-remote
%endif

%changelog
* Sat Nov 12 2005 Brian Pepple <bdpepple at ameritech.net> - 0.6-4
- Remove obsoletes xchat.
- Add patch to change datadir location.
- Add patch to change config dir.

* Thu Nov 10 2005 Brian Pepple <bdpepple at ameritech.net> - 0.6-3
- Add xchat-remote to files, and re-add dbus config flag.

* Thu Nov 10 2005 Brian Pepple <bdpepple at ameritech.net> - 0.6-2
- Merge some items from Bastien Nocera's spec file (#172873).
- Add configure option to enable ipv6 & shm tinting support.
- Simplify schemas installation.

* Tue Oct 25 2005 Brian Pepple <bdpepple at ameritech.net> - 0.6-1
- Initial Fedora Extras spec file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2005 14:44:36 -0000	1.1
+++ .cvsignore	12 Nov 2005 14:45:59 -0000	1.2
@@ -0,0 +1 @@
+xchat-gnome-0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2005 14:44:36 -0000	1.1
+++ sources	12 Nov 2005 14:45:59 -0000	1.2
@@ -0,0 +1 @@
+ef76823773da1e216c580cc0e289d2b4  xchat-gnome-0.6.tar.bz2

More information about the fedora-extras-commits mailing list