rpms/geomview/FC-5 geomview.spec,1.13,1.14
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Aug 9 14:21:35 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/geomview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12296
Modified Files:
geomview.spec
Log Message:
* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.18.rc8
- rename (man/man1/)animate.1 -> geomview-animate.1 to avoid
Conflicts: ImageMagick
Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/geomview.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geomview.spec 8 Aug 2006 15:42:44 -0000 1.13
+++ geomview.spec 9 Aug 2006 14:21:35 -0000 1.14
@@ -8,7 +8,7 @@
Name: geomview
Summary: Interactive 3D viewing program
Version: 1.8.2
-Release: 0.17.%{beta}%{?dist}
+Release: 0.18.%{beta}%{?dist}
License: LGPL
Url: http://www.geomview.org/
@@ -200,6 +200,10 @@
# 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
+
# rpmdocs
make -k -C doc docdir=`pwd`/rpmdocs install-docDATA ||:
make -k -C doc dochtmldir=`pwd`/rpmdocs/html install-dochtmlDATA ||:
@@ -267,6 +271,10 @@
%changelog
+* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.18.rc8
+- rename (man/man1/)animate.1 -> geomview-animate.1 to avoid
+ Conflicts: ImageMagick
+
* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.17.rc8
- 1.8.2-rc8
- -devel pkg
More information about the fedora-extras-commits
mailing list