rpms/terminatorX/devel terminatorX-against-zlib1.2.7.patch, NONE, 1.1 terminatorX.spec, 1.9, 1.10

[Orcan Ogetbil]

Author: oget

Update of /cvs/free/rpms/terminatorX/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24355

Modified Files:
	terminatorX.spec 
Added Files:
	terminatorX-against-zlib1.2.7.patch 
Log Message:
* Sun Mar 24 2013 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 3.84-4
- Build fix against newer zlib
- Spec file cleanup


terminatorX-against-zlib1.2.7.patch:
 tX_midiin.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE terminatorX-against-zlib1.2.7.patch ---
diff -rupN terminatorX-3.84.old/src/tX_midiin.cc terminatorX-3.84/src/tX_midiin.cc
--- terminatorX-3.84.old/src/tX_midiin.cc	2011-11-13 07:53:51.000000000 -0500
+++ terminatorX-3.84/src/tX_midiin.cc	2013-03-24 15:59:01.904683280 -0400
@@ -447,7 +447,7 @@ gboolean tX_midiin::midi_learn_destroy(G
 
 void tX_midiin::store_connections(FILE *rc, char *indent) 
 {
-	gzFile *rz=NULL;
+	gzFile rz=NULL;
 	
 	tX_store("%s<midi_connections>\n", indent);
 


Index: terminatorX.spec
===================================================================
RCS file: /cvs/free/rpms/terminatorX/devel/terminatorX.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- terminatorX.spec	3 Mar 2013 21:47:38 -0000	1.9
+++ terminatorX.spec	24 Mar 2013 20:05:03 -0000	1.10
@@ -11,7 +11,8 @@
 Patch1:        %{name}-endian_h.patch
 # Fix DSO linking
 Patch2:        %{name}-linking.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Build fix against newer zlib
+Patch3:        %{name}-against-zlib1.2.7.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
@@ -50,6 +51,7 @@
 %patch0 -p1 -b .gcc44
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .linking
+%patch3 -p1 -b .zlib1.2.7
 
 # To match the freedesktop standards
 sed -i 's|\.png||' gnome-support/%{name}.desktop
@@ -66,7 +68,6 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # install mime files
@@ -93,8 +94,6 @@
 rm -f %{buildroot}%{_datadir}/gnome/apps/Multimedia/%{name}.desktop
 rm -rf %{buildroot}%{_var}/scrollkeeper
 
-%clean
-rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -112,7 +111,6 @@
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING* NEWS README* THANKS TODO 
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
@@ -125,6 +123,10 @@
 
 
 %changelog
+* Sun Mar 24 2013 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 3.84-4
+- Build fix against newer zlib
+- Spec file cleanup
+
 * Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 3.84-3
 - Mass rebuilt for Fedora 19 Features