rpms/file-roller/devel .cvsignore, 1.74, 1.75 file-roller.spec, 1.128, 1.129 sources, 1.74, 1.75 folder-icon.patch, 1.1, NONE open-with.patch, 1.1, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28816

Modified Files:
	.cvsignore file-roller.spec sources 
Removed Files:
	folder-icon.patch open-with.patch 
Log Message:
2.23.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	5 Aug 2008 02:27:56 -0000	1.74
+++ .cvsignore	23 Aug 2008 01:22:57 -0000	1.75
@@ -1 +1 @@
-file-roller-2.23.5.tar.bz2
+file-roller-2.23.6.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- file-roller.spec	9 Aug 2008 02:25:54 -0000	1.128
+++ file-roller.spec	23 Aug 2008 01:22:58 -0000	1.129
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.23.5
-Release: 	3%{?dist}
+Version:	2.23.6
+Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -44,19 +44,12 @@
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=546978
-Patch0: folder-icon.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=547017
-Patch1: open-with.patch
-
 %description
 File Roller is an application for creating and viewing archives files, 
 such as tar files.
 
 %prep
 %setup -q
-%patch0 -p0 -b .folder-icon
-%patch1 -p0 -b .open-with
 
 autoreconf
 
@@ -135,6 +128,10 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Fri Aug 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.6-1
+- Update to 2.23.6
+- Drop upstreamed patches
+
 * Fri Aug  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-3
 - Fix a segfault
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	5 Aug 2008 02:27:56 -0000	1.74
+++ sources	23 Aug 2008 01:22:58 -0000	1.75
@@ -1 +1 @@
-ab7534b92d1a8c29da39862490c84940  file-roller-2.23.5.tar.bz2
+ef4cd14f8129bfde4c6c49643cc91332  file-roller-2.23.6.tar.bz2


--- folder-icon.patch DELETED ---


--- open-with.patch DELETED ---