commit b235dc0a9b29e2f4c41d8cc11be0f4e69fc78a37 Author: Szymon Siwek <s...@pld-linux.org> Date: Sun Nov 15 20:34:34 2015 +0100
added install.patch aircrack-ng.spec | 2 ++ install.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) --- diff --git a/aircrack-ng.spec b/aircrack-ng.spec index 02084e4..33ac355 100644 --- a/aircrack-ng.spec +++ b/aircrack-ng.spec @@ -25,6 +25,7 @@ Group: Applications/Networking Source0: http://download.aircrack-ng.org/%{name}-%{version}-%{subver}.tar.gz # Source0-md5: ebe9d537f06f4d6956213af09c4476da URL: http://www.aircrack-ng.org/ +Patch0: install.patch BuildRequires: libnl-devel BuildRequires: openssl-devel BuildRequires: pkgconfig @@ -51,6 +52,7 @@ convert, etc.). %prep %setup -q -n %{name}-%{version}-%{subver} +%patch0 -p1 sed -i -e 's#-Werror -O3#$(PLDFLAGS)#g' common.mak diff --git a/install.patch b/install.patch new file mode 100644 index 0000000..6ec6238 --- /dev/null +++ b/install.patch @@ -0,0 +1,54 @@ +--- aircrack-ng-1.2-rc2/scripts/airdrop-ng/Makefile.orig 2015-11-15 19:30:24.697474528 +0100 ++++ aircrack-ng-1.2-rc2/scripts/airdrop-ng/Makefile 2015-11-15 19:30:45.967673386 +0100 +@@ -8,7 +8,7 @@ all: + @echo "Nothing to do. Run make install" + + install: doc +- python setup.py install --prefix="$(prefix)" --record files.txt ++ python setup.py install --prefix="$(prefix)" --record files.txt --root=$(DESTDIR) + + doc: + $(MAKE) -C doc install +--- aircrack-ng-1.2-rc2/scripts/airgraph-ng/Makefile.orig 2015-11-15 19:19:13.576610550 +0100 ++++ aircrack-ng-1.2-rc2/scripts/airgraph-ng/Makefile 2015-11-15 19:40:45.567167477 +0100 +@@ -8,12 +8,12 @@ all: + @echo "Nothing to do. Run make install" + + install: doc +- python setup.py install --prefix="$(prefix)" --record files.txt ++ python setup.py install --prefix="$(prefix)" --record files.txt --root=$(DESTDIR) + + doc: + $(MAKE) -C man install +- install -d $(prefix)$(docdir) +- install -d $(prefix)/share/airgraph-ng ++ install -d $(DESTDIR)$(docdir) ++ install -d $(DESTDIR)$(prefix)/share/airgraph-ng + install -m 644 $(DOCFILES) $(DESTDIR)$(docdir) + + uninstall: clean +--- aircrack-ng-1.2-rc2/scripts/airoscript-ng/Makefile.orig 2015-11-15 20:01:54.558201732 +0100 ++++ aircrack-ng-1.2-rc2/scripts/airoscript-ng/Makefile 2015-11-15 20:22:37.877751547 +0100 +@@ -8,8 +8,8 @@ INSTALL = install -c + INSTALLDATA = install -c -m 644 + INSTALLBIN = install -c -m 755 + +-data=$(prefix)/share +-bindir=$(prefix)/sbin/ ++data=$(DESTDIR)$(prefix)/share ++bindir=$(DESTDIR)$(prefix)/sbin/ + picdir=$(data)/pixmaps/ + appdir=$(data)/applications/ + locale=$(data)/locale +@@ -75,9 +75,9 @@ install-desktop: + @xdg-desktop-menu install $(appdir)/airoscript-ng_gtk.desktop + + generate-locale: +- @for i in $(srcdir)/locale/* ; do \ ++ for i in $(srcdir)/locale/* ; do \ + if [ -d $$i ] && [ $$i != "." ] && [ $$i != ".." ]; then \ +- make -s -C $$i &> /dev/null ; \ ++ make -s -C $$i localedir=$(locale); \ + fi ; \ + done + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/aircrack-ng.git/commitdiff/41e6054eae262640cd259177ca3c47c0f518fac0 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit