rpms/meld/EL-6 import.log, NONE, 1.1 .cvsignore, 1.13, 1.14 meld.spec, 1.32, 1.33 sources, 1.13, 1.14

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/meld/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21596/EL-6

Modified Files:
	.cvsignore meld.spec sources 
Added Files:
	import.log 
Log Message:
Pull from devel


--- NEW FILE import.log ---
meld-1_3_1-2_fc14:EL-6:meld-1.3.1-2.fc14.src.rpm:1278622748


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meld/EL-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 May 2009 19:38:16 -0000	1.13
+++ .cvsignore	8 Jul 2010 20:59:31 -0000	1.14
@@ -1 +1 @@
-meld-1.3.0.tar.bz2
+meld-1.3.1.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meld/EL-6/meld.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- meld.spec	25 Jul 2009 12:02:02 -0000	1.32
+++ meld.spec	8 Jul 2010 20:59:31 -0000	1.33
@@ -1,12 +1,12 @@
 Name:		meld
-Version:	1.3.0
+Version:	1.3.1
 Release:	2%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://meld.sourceforge.net/
-Source0:	http://ftp.gnome.org/pub/gnome/sources/meld/1.3/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.3/%{name}-%{version}.tar.bz2
 Patch1:		%{name}-scrollkeeper.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,9 +20,6 @@ Requires:	pygtk2 >= 2.8.0
 Requires:	pygtk2-libglade
 Requires:	pygobject2 >= 2.8.0
 
-Requires(post):	scrollkeeper
-Requires(postun): scrollkeeper
-
 BuildArch:	noarch
 
 %description
@@ -57,31 +54,25 @@ desktop-file-install --vendor fedora    
 %find_lang %{name}
 
 
-%post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-
-
-%postun
-scrollkeeper-update -q || :
-
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/application-registry/%{name}*
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
 
 
 %changelog
+* Sun Apr 25 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.3.1-2
+- Remove clean section. No longer needed.
+
+* Wed Jan  6 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.3.1-1
+- Update to 1.3.1.
+- Remove scrollkeeper scriptlets since they are no longer needed.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meld/EL-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 May 2009 19:38:16 -0000	1.13
+++ sources	8 Jul 2010 20:59:31 -0000	1.14
@@ -1 +1 @@
-8f8eaabfb398cb59e7cb51284003f552  meld-1.3.0.tar.bz2
+05885811cf0bccc051c3f44938ff54ed  meld-1.3.1.tar.bz2