X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63b1cb8227e6ced34de6862e45333b1c5a7e8346..2943e582f25ab22c02b609ea86d7ef6e85e475f0:/wxPython/distrib/wxPythonFull.spec.in

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index a0f1ca2b36..9cbb0f7ade 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -8,8 +8,8 @@
 %define version @VERSION@
 %define ver2    @VER2@
 %define release 1
-%define wxpref  %{pref}/lib/wxPython-%{version}
 %define wxprefbase %{pref}/lib/wxPython
+%define wxpref  %{wxprefbase}-%{version}
 %define name    wxPython%{port}-py%{pyver}
 
 
@@ -188,7 +188,7 @@ cd $WXDIR/wxPython
 #
 # TODO:  Should this be dependent on %{builtin_libs} or something like it?
 
-mkdir -p $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT%{pref}/bin
 for s in \
 	helpviewer \
 	img2png \
@@ -200,25 +200,30 @@ for s in \
 	pywrap \
 	pyshell \
 	xrced; do
-    cp scripts/$s $RPM_BUILD_ROOT/%{pref}/bin
+    cp scripts/$s $RPM_BUILD_ROOT%{pref}/bin
 done
 
 
 # Install wxrc
-cp $WXDIR/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT/%{pref}/bin
+cp $WXDIR/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT%{pref}/bin
+
+
+# link specific name to generic name
+ln -s wxPython-%{version} $RPM_BUILD_ROOT%{wxprefbase}
+
 
 
 # Copy icons and make menu entries
 #-- This only works for Mandrake.  Is there a cross-distro way to do it?
-##mkdir -p $RPM_BUILD_ROOT/%{_iconsdir}
-##mkdir -p $RPM_BUILD_ROOT/%{_miconsdir}
-##mkdir -p $RPM_BUILD_ROOT/%{_menudir}
-##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_32.png $RPM_BUILD_ROOT/%{_iconsdir}/PyCrust.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_16.png $RPM_BUILD_ROOT/%{_miconsdir}/PyCrust.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT/%{_iconsdir}/XRCed.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT/%{_miconsdir}/XRCed.png
+##mkdir -p $RPM_BUILD_ROOT%{_iconsdir}
+##mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
+##mkdir -p $RPM_BUILD_ROOT%{_menudir}
+##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_32.png $RPM_BUILD_ROOT%{_iconsdir}/PyCrust.png
+##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_16.png $RPM_BUILD_ROOT%{_miconsdir}/PyCrust.png
+##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_iconsdir}/XRCed.png
+##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT%{_miconsdir}/XRCed.png
 ##
-##cat > $RPM_BUILD_ROOT/%{_menudir}/%{name} <<EOF
+##cat > $RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
 ##?package(%{name}): command="%_bindir/pyshell" needs="X11" \
 ##icon="PyCrust.png" section="Applications/Development" \
 ##title="PyShell" longtitle="Python Shell"
@@ -253,6 +258,7 @@ $GFL    $RPM_BUILD_ROOT %{pref}/lib                >> FILELIST
 $GFL -r $RPM_BUILD_ROOT %{pref}/lib/python%{pyver} >> FILELIST
 $GFL -r $RPM_BUILD_ROOT %{pref}/share              >> FILELIST
 $GFL    $RPM_BUILD_ROOT %{wxpref}                  >> FILELIST
+$GFL    $RPM_BUILD_ROOT %{wxprefbase}              >> FILELIST
 $GFL    $RPM_BUILD_ROOT %{wxpref}/lib              >> FILELIST
 $GFL    $RPM_BUILD_ROOT "%{wxpref}/lib/libwx*"     >> FILELIST
 $GFL -r $RPM_BUILD_ROOT %{wxpref}/share            >> FILELIST
@@ -274,11 +280,10 @@ $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
 ##%{clean_menus}
 
 
-%post
+%pre
 if [ -e %{wxprefbase} ]; then
-	rm %{wxprefbase}
+	rm -r %{wxprefbase}
 fi
-ln -s %{wxpref} %{wxprefbase}
 
 %postun
 if [ -e %{wxprefbase} ]; then