rpms/xchat-gnome/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xchat-gnome.spec, 1.7, 1.8 xchat-gnome-323944.patch, 1.1, NONE xchat-gnome-datadir.patch, 1.1, NONE

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Removed Files:
	xchat-gnome-323944.patch xchat-gnome-datadir.patch 
Log Message:
* Thu Dec 15 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-01.rc1
- Update to 0.8rc1.
- Drop documentation removed from upstream tarball.
- Drop depreciated config options.
- Enable dbus support.
- Drop 323944 patch, since it's been applied upstream.
- Drop datadir patch, since it's been applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 19:49:40 -0000	1.3
+++ .cvsignore	15 Dec 2005 21:54:05 -0000	1.4
@@ -1 +1 @@
-xchat-gnome-0.7.tar.bz2
+xchat-gnome-0.8rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 19:49:40 -0000	1.3
+++ sources	15 Dec 2005 21:54:05 -0000	1.4
@@ -1 +1 @@
-a5f0940ee6389d58222a04facca0aa0d  xchat-gnome-0.7.tar.bz2
+9e43be1379796baf270e417202ef6c95  xchat-gnome-0.8rc1.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchat-gnome.spec	14 Dec 2005 17:51:47 -0000	1.7
+++ xchat-gnome.spec	15 Dec 2005 21:54:05 -0000	1.8
@@ -1,21 +1,19 @@
 %if "%fedora" >= "5"
-    %define with_dbus 0
+    %define with_dbus 1
 %else
     %define with_dbus 0
 %endif
 
 Name:           xchat-gnome
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8
+Release:        0.1.rc1%{?dist}
 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
-Patch2:		%{name}-323944.patch
+Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}rc1.tar.bz2
+Patch0:		%{name}-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -51,24 +49,12 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .datadir
-%patch1 -p1 -b .config
-%patch2 -p1 -b .323944
+%setup -q -n %{name}-%{version}rc1
+%patch0 -p1 -b .config
 
 
 %build
-%configure --disable-gtkfe	\
-	   --disable-tcl	\
-	   --enable-ipv6	\
-	   --enable-shm		\
-	   --disable-libnotify	\
-%if %{with_dbus}
-	   --enable-dbus	
-%else
-	   --disable-dbus
-%endif
-
+%configure --disable-tcl
 make %{?_smp_mflags}
 
 
@@ -79,17 +65,13 @@
 %find_lang %{name}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{l,}a
 
 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
@@ -133,7 +115,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING faq.html README plugins/plugin20.html
+%doc COPYING AUTHORS
 %doc plugins/perl/xchat2-perldocs.html
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/*.schemas
@@ -145,11 +127,19 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/plugins/
 %if %{with_dbus}
-%{_bindir}/xchat-remote
+%{_bindir}/%{name}-remote
 %endif
 
 
 %changelog
+* Thu Dec 15 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-01.rc1
+- Update to 0.8rc1.
+- Drop documentation removed from upstream tarball.
+- Drop depreciated config options.
+- Enable dbus support.
+- Drop 323944 patch, since it's been applied upstream.
+- Drop datadir patch, since it's been applied upstream.
+
 * Wed Dec 14 2005 Brian Pepple <bdpepple at ameritech.net> - 0.7-4
 - Add patch to fix #175751. 
 


--- xchat-gnome-323944.patch DELETED ---


--- xchat-gnome-datadir.patch DELETED ---