rpms/gkrellm/devel .cvsignore, 1.4, 1.5 gkrellm.spec, 1.12, 1.13 sources, 1.4, 1.5 gkrellm-2.3.0-gnutls.patch, 1.1, NONE gkrellm-2.3.0-libsensors4.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19318

Modified Files:
	.cvsignore gkrellm.spec sources 
Removed Files:
	gkrellm-2.3.0-gnutls.patch gkrellm-2.3.0-libsensors4.patch 
Log Message:
* Mon Dec  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-1
- New upstream release 2.3.1
- Drop upstreamed gnutls and lm_sensors-3.0.0 patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jul 2007 14:10:11 -0000	1.4
+++ .cvsignore	3 Dec 2007 20:34:00 -0000	1.5
@@ -1 +1 @@
-gkrellm-2.3.0.tar.bz2
+gkrellm-2.3.1.tar.bz2


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gkrellm.spec	28 Oct 2007 10:22:29 -0000	1.12
+++ gkrellm.spec	3 Dec 2007 20:34:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gkrellm
-Version:        2.3.0
-Release:        5%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -9,12 +9,10 @@
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
-Patch0:         gkrellm-2.3.0-gnutls.patch
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-Patch5:         gkrellm-2.3.0-libsensors4.patch
 BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,12 +57,10 @@
 
 %prep
 %setup -q
-%patch0 -p1 -z .gnutls
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
-%patch5 -p1 -z .libsensors4
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -171,6 +167,10 @@
 
 
 %changelog
+* Mon Dec  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-1
+- New upstream release 2.3.1
+- Drop upstreamed gnutls and lm_sensors-3.0.0 patches
+
 * Wed Oct 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-5
 - Add support for lm_sensors-3.0.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jul 2007 14:10:11 -0000	1.4
+++ sources	3 Dec 2007 20:34:00 -0000	1.5
@@ -1 +1 @@
-8ced6843f4681ad8501fd04285ecff1f  gkrellm-2.3.0.tar.bz2
+009d8dddd3ce5cc83a4bb4d559ee922d  gkrellm-2.3.1.tar.bz2


--- gkrellm-2.3.0-gnutls.patch DELETED ---


--- gkrellm-2.3.0-libsensors4.patch DELETED ---