r1866: *** empty log message ***

diff --git a/rpm/ctsim.spec b/rpm/ctsim.spec
index 8369d9fb6f6d4927ae25caac8efc806f14f0f4d6..d8c7cae542862475a9414e1414604f4dd9c85a37 100644 (file)
--- a/rpm/ctsim.spec
+++ b/rpm/ctsim.spec
@@ -1,5 +1,5 @@
 # Version of CTSim
-%define version 3.0.3
+%define version 3.5.0
 
 Summary: CTSim - Open-Source Computed Tomography Simulator
 Name: ctsim
@@ -18,16 +18,12 @@ CTSim is a Computed Tomography Simulator.
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
-       ./configure --prefix=/usr/local --enable-static --without-lam
+       ./configure --prefix=/usr --enable-static --without-lam
 make
 
 %install
 strip src/ctsim
 strip tools/ctsimtext
-install -s -m 755 -o 0 -g 0 src/ctsim /usr/local/bin/ctsim
-install -s -m 755 -o 0 -g 0 tools/ctsimtext /usr/local/bin/ctsimtext
-install -m 755 -o 0 -g 0 tools/sample-ctsim.sh /usr/local/bin/sample-ctsim.sh
-install -m 755 -o 0 -g 0 doc/ctsim.htb /usr/local/man/ctsim.htb
 rm -f /usr/local/bin/if1
 rm -f /usr/local/bin/if2
 rm -f /usr/local/bin/ifexport
@@ -37,22 +33,29 @@ rm -f /usr/local/bin/phm2pj
 rm -f /usr/local/bin/pj2if
 rm -f /usr/local/bin/pjinfo
 rm -f /usr/local/bin/pjrec
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/if1
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/if2
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/ifexport
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/ifinfo
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/phm2if
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/phm2pj
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/pj2if
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/pjinfo
-ln -s /usr/local/bin/ctsimtext /usr/local/bin/pjrec
+rm -f /usr/local/bin/ctsim
+rm -f /usr/local/bin/ctsimtext
+rm -rf /usr/local/man/ctsim.htb
+install -s -m 755 -o 0 -g 0 src/ctsim /usr/bin/ctsim
+install -s -m 755 -o 0 -g 0 tools/ctsimtext /usr/bin/ctsimtext
+install -m 755 -o 0 -g 0 tools/sample-ctsim.sh /usr/bin/sample-ctsim.sh
+install -m 755 -o 0 -g 0 doc/ctsim.htb /usr/share/ctsim/ctsim.htb
+ln -sf ctsimtext /usr/bin/if1
+ln -sf ctsimtext /usr/bin/if2
+ln -sf ctsimtext /usr/bin/ifexport
+ln -sf ctsimtext /usr/bin/ifinfo
+ln -sf ctsimtext /usr/bin/phm2if
+ln -sf ctsimtext /usr/bin/phm2pj
+ln -sf ctsimtext /usr/bin/pj2if
+ln -sf ctsimtext /usr/bin/pjinfo
+ln -sf ctsimtext /usr/bin/pjrec
 
 %files
 %doc NEWS README COPYING ChangeLog INSTALL
 
-/usr/local/bin/ctsim
-/usr/local/bin/ctsimtext
-/usr/local/man/ctsim.htb
-/usr/local/bin/sample-ctsim.sh
+/usr/bin/ctsim
+/usr/bin/ctsimtext
+/usr/share/ctsim/ctsim.htb
+/usr/share/ctsim/sample-ctsim.sh