Fixed rpm build warning - extension.js listed twice

Building the ipa rpms returns this:
warning: File listed twice: /usr/share/ipa/ui/extension.js

This is because of a glob:
%{_usr}/share/ipa/ui/*.js

and then more specifically:
%config(noreplace) %{_usr}/share/ipa/ui/extension.js

https://fedorahosted.org/freeipa/ticket/2253
This commit is contained in:
Petr Vobornik 2012-03-15 09:47:18 +01:00
parent 66692127c6
commit 2449b4d827
6 changed files with 19 additions and 3 deletions

View File

@ -572,7 +572,8 @@ fi
%{_usr}/share/ipa/ui/*.svg
%{_usr}/share/ipa/ui/*.ttf
%{_usr}/share/ipa/ui/*.woff
%config(noreplace) %{_usr}/share/ipa/ui/extension.js
%dir %{_usr}/share/ipa/ui/ext
%config(noreplace) %{_usr}/share/ipa/ui/ext/extension.js
%dir %{_usr}/share/ipa/ui/images
%{_usr}/share/ipa/ui/images/*.png
%{_usr}/share/ipa/ui/images/*.gif

View File

@ -75,6 +75,7 @@ AC_CONFIG_FILES([
migration/Makefile
share/Makefile
ui/Makefile
ui/ext/Makefile
ui/images/Makefile
tools/Makefile
tools/man/Makefile

View File

@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = 1.7
NULL =
SUBDIRS = \
ext \
images \
$(NULL)
@ -20,7 +21,6 @@ app_DATA = \
dns.js \
entitle.js \
entity.js \
extension.js \
facet.js \
favicon.ico \
field.js \

View File

@ -0,0 +1,14 @@
NULL =
appdir = $(IPA_DATA_DIR)/ui/ext
app_DATA = \
extension.js \
$(NULL)
EXTRA_DIST = \
$(app_DATA) \
$(NULL)
MAINTAINERCLEANFILES = \
*~ \
Makefile.in

View File

@ -44,7 +44,7 @@
<script type="text/javascript" src="aci.js"></script>
<script type="text/javascript" src="entitle.js"></script>
<script type="text/javascript" src="extension.js"></script>
<script type="text/javascript" src="ext/extension.js"></script>
<script type="text/javascript" src="webui.js"></script>
<link rel="stylesheet" type="text/css" href="jquery-ui.css" />