diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2012-03-15 09:47:18 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2012-03-19 18:54:20 +0100 |
| commit | 0d003b322c6b329d9217a7040fd000016b4f1191 (patch) | |
| tree | a457c868276532d8e316ba931bb5e3dd34a4f0cf /install | |
| parent | 224e8c3830d6ce40327497e91326a0c5b8a02f62 (diff) | |
| download | freeipa.git-0d003b322c6b329d9217a7040fd000016b4f1191.tar.gz freeipa.git-0d003b322c6b329d9217a7040fd000016b4f1191.tar.xz freeipa.git-0d003b322c6b329d9217a7040fd000016b4f1191.zip | |
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
Diffstat (limited to 'install')
| -rw-r--r-- | install/configure.ac | 1 | ||||
| -rw-r--r-- | install/ui/Makefile.am | 2 | ||||
| -rw-r--r-- | install/ui/ext/Makefile.am | 14 | ||||
| -rw-r--r-- | install/ui/ext/extension.js (renamed from install/ui/extension.js) | 0 | ||||
| -rw-r--r-- | install/ui/index.html | 2 |
5 files changed, 17 insertions, 2 deletions
diff --git a/install/configure.ac b/install/configure.ac index c70eef4a..bb1ec502 100644 --- a/install/configure.ac +++ b/install/configure.ac @@ -75,6 +75,7 @@ AC_CONFIG_FILES([ migration/Makefile share/Makefile ui/Makefile + ui/ext/Makefile ui/images/Makefile tools/Makefile tools/man/Makefile diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index 6e019ecd..e4256de9 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -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 \ diff --git a/install/ui/ext/Makefile.am b/install/ui/ext/Makefile.am new file mode 100644 index 00000000..29a6387c --- /dev/null +++ b/install/ui/ext/Makefile.am @@ -0,0 +1,14 @@ +NULL = + +appdir = $(IPA_DATA_DIR)/ui/ext +app_DATA = \ + extension.js \ + $(NULL) + +EXTRA_DIST = \ + $(app_DATA) \ + $(NULL) + +MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in diff --git a/install/ui/extension.js b/install/ui/ext/extension.js index e69de29b..e69de29b 100644 --- a/install/ui/extension.js +++ b/install/ui/ext/extension.js diff --git a/install/ui/index.html b/install/ui/index.html index 6b1be869..01335d75 100644 --- a/install/ui/index.html +++ b/install/ui/index.html @@ -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" /> |