clean (most of) vendors

diff --git a/aegisub.spec b/aegisub.spec
index 357579f995250526dd3ea9d8fc243403ce80e6ca..a4f51eecdb91838d0d487387f4faf69b63c8e3d0 100644 (file)
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -1,6 +1,7 @@
 # TODO
 # TODO

-# - needs wx-config to build with wxWidgets
-# - system luajit
+# - unvendor vendor/luabins
+# - unvendor vendor/luajit
+# - unvendor vendor/universalchardet

 # - our cxxflags
 
 # Conditional build:
 # - our cxxflags
 
 # Conditional build:


@@ -52,6 +53,10 @@ support using these advanced functions with ease.
 %prep
 %setup -q
 
 %prep
 %setup -q
 

+mv vendor{,.keep}
+mkdir vendor
+mv vendor.keep/{luabins,luajit,universalchardet} vendor
+

 %build
 %configure \
        --with-player-audio=PulseAudio \
 %build
 %configure \
        --with-player-audio=PulseAudio \


@@ -63,7 +68,8 @@ support using these advanced functions with ease.
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-%make_install
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT

 
 %find_lang %{name}-32
 
 
 %find_lang %{name}-32