mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-01-26 16:16:31 -06:00
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:
parent
66692127c6
commit
2449b4d827
@ -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
|
||||
|
@ -75,6 +75,7 @@ AC_CONFIG_FILES([
|
||||
migration/Makefile
|
||||
share/Makefile
|
||||
ui/Makefile
|
||||
ui/ext/Makefile
|
||||
ui/images/Makefile
|
||||
tools/Makefile
|
||||
tools/man/Makefile
|
||||
|
@ -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 \
|
||||
|
14
install/ui/ext/Makefile.am
Normal file
14
install/ui/ext/Makefile.am
Normal 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
|
@ -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" />
|
||||
|
Loading…
Reference in New Issue
Block a user