- new TODO about make breakage

diff --git a/aegisub.spec b/aegisub.spec
index 4e238f221fd5f8e5dfa58c45c700477d334b52e4..c7af3ce938bf5b71a42b5a4784c9c3aa753d4a18 100644 (file)
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -1,4 +1,5 @@
 # TODO
+# - make 4.3 breaks build
 # - unvendor vendor/luabins
 # - unvendor vendor/luajit
 # - unvendor vendor/universalchardet
@@ -98,7 +99,12 @@ mkdir vendor
 %{__mv} vendor.keep/{luabins,luajit,universalchardet} vendor
 
 %build
+<<<<<<< Updated upstream
 %{__aclocal} -I m4macros
+=======
+%{__libtoolize}
+%{__aclocal}
+>>>>>>> Stashed changes
 %{__autoconf}
 %{__autoheader}
 %configure \