rpms/monotone-viz/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 monotone-viz.spec, 1.6, 1.7 sources, 1.2, 1.3 monotone-viz-1.0.1-gio.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/monotone-viz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27541/devel

Modified Files:
	.cvsignore import.log monotone-viz.spec sources 
Removed Files:
	monotone-viz-1.0.1-gio.patch 
Log Message:
- Update to 1.0.2, remove patch no longer needed.
- Minor specfile fixes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone-viz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jan 2008 20:34:09 -0000	1.2
+++ .cvsignore	21 Jan 2010 08:21:49 -0000	1.3
@@ -1 +1 @@
-monotone-viz-1.0.1-nolablgtk.tar.gz
+monotone-viz-1.0.2-nolablgtk.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone-viz/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	26 Feb 2009 23:54:49 -0000	1.1
+++ import.log	21 Jan 2010 08:21:49 -0000	1.2
@@ -1 +1,2 @@
 monotone-viz-1_0_1-4_fc10:HEAD:monotone-viz-1.0.1-4.fc10.src.rpm:1235692446
+monotone-viz-1_0_2-1_fc12:HEAD:monotone-viz-1.0.2-1.fc12.src.rpm:1264062047


Index: monotone-viz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone-viz/devel/monotone-viz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- monotone-viz.spec	25 Jul 2009 15:04:37 -0000	1.6
+++ monotone-viz.spec	21 Jan 2010 08:21:50 -0000	1.7
@@ -1,16 +1,12 @@
 Name:           monotone-viz
-Version:        1.0.1
-Release:        5%{?dist}
-
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        GNOME application that visualizes Monotone ancestry graphs
 Group:          Development/Tools
 License:        GPLv2+
-
 URL:            http://oandrieu.nerim.net/monotone-viz/
 Source0:        %{url}/%{name}-%{version}-nolablgtk.tar.gz
 Source1:        monotone-viz.desktop
-Patch0:         monotone-viz-1.0.1-gio.patch
-
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-lablgtk-devel
@@ -20,20 +16,20 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  ImageMagick
 Requires:       monotone
 Requires:       graphviz
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
 # Apparently necessary exclusion for ocaml packages.
 ExcludeArch:    ppc64
 
+
 %description
 This is a small GNOME application to visualize Monotone ancestry graphs.
 
 
 %prep
 %setup0 -q
-%patch0 -p1 -b .gio
+
 
 %build
 %configure --without-local-lablgtk
@@ -41,21 +37,22 @@ make %{?_smp_mflags}
 
 convert icon.ml %{name}.png
 
-%{__cp} -f %{SOURCE1} %{name}.desktop
+%{__cp} -a %{SOURCE1} %{name}.desktop
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %{__install} -m 644 -D -p %{name}.png \
-             $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
+             %{buildroot}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
                      --vendor="" \
                      %{name}.desktop
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -67,6 +64,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 21 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.2-1
+- Update to 1.0.2.
+- Patch to avoid name clash with ocaml-lablgtk is no longer necessary.
+- Minor specfile cleanups.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone-viz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jan 2008 20:34:09 -0000	1.2
+++ sources	21 Jan 2010 08:21:50 -0000	1.3
@@ -1 +1 @@
-b6996c0360f0b897ee73c9f881763571  monotone-viz-1.0.1-nolablgtk.tar.gz
+fd08341b456c80d03d7d21c989a1e813  monotone-viz-1.0.2-nolablgtk.tar.gz


--- monotone-viz-1.0.1-gio.patch DELETED ---