rpms/geomview/devel geomview.spec,1.27,1.28

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Oct 26 19:22:43 UTC 2006


Author: rdieter

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

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
  Conflicts: lam (bug #212435)



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- geomview.spec	1 Oct 2006 21:36:53 -0000	1.27
+++ geomview.spec	26 Oct 2006 19:22:13 -0000	1.28
@@ -205,9 +205,12 @@
 # maniview manpage
 %{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
-# rename animate.1 that Conflicts: ImageMagick
-test -f $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 && \
-  mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1
+# rename animate.1 that Conflicts: ImageMagick (#202039)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
+# rename sweep.1 that Conflicts: lam (#212435)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
 
 # rpmdocs
 make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
@@ -276,6 +279,10 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
+- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
+  Conflicts: lam (bug #212435)
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
 - 1.8.2rc9
 




More information about the fedora-extras-commits mailing list