[devassistant/f22: 2/3] Added -L option for licensing files to -devel macros

[Tomas Radej]

commit 8846a070d5a0c733ba0d666660fd79d3770db7bf
Author: Tomas Radej <tradej at redhat.com>
Date:   Wed Mar 11 10:24:43 2015 +0100

    Added -L option for licensing files to -devel macros
    
    - Added deps on devassistant-dap-{devassistant,eclipse,vim}

 devassistant.macros |  4 ++--
 devassistant.spec   | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/devassistant.macros b/devassistant.macros
index 6e7aed5..7eae684 100644
--- a/devassistant.macros
+++ b/devassistant.macros
@@ -2,9 +2,9 @@
 
 %assistant_path %{_datadir}/devassistant
 
-%install_assistant() \
+%install_assistant(L:) \
 DAPI_INSTALL=%{buildroot}%{assistant_path} da pkg install %{shortname}-%{version}.dap --no-deps \
-dap2rpm -l %{shortname}-%{version}.dap > dap-files
+dap2rpm -l %{shortname}-%{version}.dap %{-L} > dap-files
 
 
 %repack_assistant() \
diff --git a/devassistant.spec b/devassistant.spec
index 32ce335..e890186 100644
--- a/devassistant.spec
+++ b/devassistant.spec
@@ -8,7 +8,7 @@
 
 Name:           devassistant
 Version:        0.10.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DevAssistant - Making life easier for developers
 
 License:        GPLv2+ and CC-BY-SA
@@ -55,6 +55,8 @@ Requires:       devassistant-dap-c
 Requires:       devassistant-dap-cpp
 Requires:       devassistant-dap-custom
 Requires:       devassistant-dap-dap
+Requires:       devassistant-dap-devassistant
+Requires:       devassistant-dap-eclipse
 Requires:       devassistant-dap-github
 Requires:       devassistant-dap-java
 Requires:       devassistant-dap-nodejs
@@ -63,6 +65,7 @@ Requires:       devassistant-dap-php
 Requires:       devassistant-dap-python
 Requires:       devassistant-dap-ruby
 Requires:       devassistant-dap-tito
+Requires:       devassistant-dap-vim
 %endif # bootstrap
 
 %global __requires_exclude ^\(/usr/bin/php\|/usr/bin/perl\|perl\\(\)
@@ -127,7 +130,8 @@ GUI is provided by the package devassistant-gui.
 Summary:        Macros needed for DAP packages distributed via RPM.
 # CLI needed for installing and linting
 Requires:       devassistant-cli
-Requires:       dap2rpm
+# License tag "-L" in %install_assistant available from 0.1.8
+Requires:       dap2rpm >= 0.1.8
 
 %description devel
 Macros needed for DAP packages distributed via RPM.
@@ -249,6 +253,10 @@ fi
 %{_rpmconfigdir}/macros.d/macros.%{name}
 
 %changelog
+* Wed Mar 11 2015 Tomas Radej <tradej at redhat.com> - 0.10.3-3
+- Added -L option for licensing files to -devel macros
+- Added deps on devassistant-dap-{devassistant,eclipse,vim}
+
 * Wed Mar  4 2015 Ville Skyttä <ville.skytta at iki.fi> - 0.10.3-2
 - Move rpm macros to %%{_rpmconfigdir}/macros.d (#1074261)