Re: [Freeipa-devel] [PATCH] admiyo-0127-add-missing-files-in-rpm
On Wed, 2011-06-15 at 09:47 +0200, Martin Kosek wrote: > On Fri, 2011-01-14 at 14:20 -0500, Adam Young wrote: > > On 01/06/2011 04:13 AM, Pavel Zůna wrote: > > > On 2011-01-05 20:57, Adam Young wrote: > > >> Had to move some files around, and added to both Makefile.am and > > >> ipa.spec > > >> > > >> > > > > > > ACK. > > > > > > Pavel > > > > > > ___ > > > Freeipa-devel mailing list > > > Freeipa-devel@redhat.com > > > https://www.redhat.com/mailman/listinfo/freeipa-devel > > Pushed to master > > NACK. This patch broke the build of master branch: > > make[5]: Entering directory > `/home/mkosek/freeipa/rpmbuild/BUILD/freeipa-2.0.90GIT058e3d0/install/ui' > make[5]: *** No rule to make target `FreeWay.otf', needed by `all-am'. > Stop. > make[5]: Leaving directory > `/home/mkosek/freeipa/rpmbuild/BUILD/freeipa-2.0.90GIT058e3d0/install/ui' > make[4]: *** [all-recursive] Error 1 > make[4]: Leaving directory > `/home/mkosek/freeipa/rpmbuild/BUILD/freeipa-2.0.90GIT058e3d0/install/ui' > make[3]: *** [all-recursive] Error 1 > > Martin I pointed my finger to incorrect patch, sorry Adam. The patch that broke the master build is Kyle's "0017-List-page-spacing-changes" (fb6f06d94dcfd664ba817ce61f84d600ee17c260). Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] admiyo-0127-add-missing-files-in-rpm
On Fri, 2011-01-14 at 14:20 -0500, Adam Young wrote: > On 01/06/2011 04:13 AM, Pavel Zůna wrote: > > On 2011-01-05 20:57, Adam Young wrote: > >> Had to move some files around, and added to both Makefile.am and > >> ipa.spec > >> > >> > > > > ACK. > > > > Pavel > > > > ___ > > Freeipa-devel mailing list > > Freeipa-devel@redhat.com > > https://www.redhat.com/mailman/listinfo/freeipa-devel > Pushed to master NACK. This patch broke the build of master branch: make[5]: Entering directory `/home/mkosek/freeipa/rpmbuild/BUILD/freeipa-2.0.90GIT058e3d0/install/ui' make[5]: *** No rule to make target `FreeWay.otf', needed by `all-am'. Stop. make[5]: Leaving directory `/home/mkosek/freeipa/rpmbuild/BUILD/freeipa-2.0.90GIT058e3d0/install/ui' make[4]: *** [all-recursive] Error 1 make[4]: Leaving directory `/home/mkosek/freeipa/rpmbuild/BUILD/freeipa-2.0.90GIT058e3d0/install/ui' make[3]: *** [all-recursive] Error 1 Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] admiyo-0127-add-missing-files-in-rpm
On 01/06/2011 04:13 AM, Pavel Zůna wrote: On 2011-01-05 20:57, Adam Young wrote: Had to move some files around, and added to both Makefile.am and ipa.spec ACK. Pavel ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel Pushed to master ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] admiyo-0127-add-missing-files-in-rpm
On 2011-01-05 20:57, Adam Young wrote: Had to move some files around, and added to both Makefile.am and ipa.spec ACK. Pavel ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
[Freeipa-devel] [PATCH] admiyo-0127-add-missing-files-in-rpm
Had to move some files around, and added to both Makefile.am and ipa.spec
From 7474a2cf3ffd0af259dc32d5b4652b054b585340 Mon Sep 17 00:00:00 2001
From: Adam Young
Date: Wed, 5 Jan 2011 14:02:24 -0500
Subject: [PATCH] add missing files in rpm
Fonts, header images, and json.js
---
install/static/{fonts => }/FreeWay-Bold.otf | Bin 47524 -> 47524 bytes
install/static/{fonts => }/FreeWay.otf | Bin 38948 -> 38948 bytes
install/static/Makefile.am |5 +
install/static/ipa.css |4 ++--
ipa.spec.in |1 +
5 files changed, 8 insertions(+), 2 deletions(-)
rename install/static/{fonts => }/FreeWay-Bold.otf (100%)
rename install/static/{fonts => }/FreeWay.otf (100%)
diff --git a/install/static/fonts/FreeWay-Bold.otf b/install/static/FreeWay-Bold.otf
similarity index 100%
rename from install/static/fonts/FreeWay-Bold.otf
rename to install/static/FreeWay-Bold.otf
diff --git a/install/static/fonts/FreeWay.otf b/install/static/FreeWay.otf
similarity index 100%
rename from install/static/fonts/FreeWay.otf
rename to install/static/FreeWay.otf
diff --git a/install/static/Makefile.am b/install/static/Makefile.am
index 40d3b521b28fc8c962fe108c0d1ba6fc02daa00a..5c88d7800aaf4e695b7283aea057d88a9e347e21 100644
--- a/install/static/Makefile.am
+++ b/install/static/Makefile.am
@@ -14,6 +14,7 @@ app_DATA = \
ipa_logo_180x50.png \
ipa.js\
ipa.css\
+ json2.js \
jquery.js \
jquery-ui.js \
jquery.ba-bbq.js \
@@ -47,6 +48,8 @@ app_DATA = \
Mainnav-background.png \
Mainnav-offtab.png \
Mainnav-ontab.png \
+ modal-background.png \
+ panel-background.png \
Subnav-background.png \
Subnav-offbutton.png \
Subnav-onbutton.png \
@@ -65,6 +68,8 @@ app_DATA = \
ui-icons_ededed_256x240.png \
ui-icons_ffcf29_256x240.png \
ui-icons_ff_256x240.png \
+ FreeWay.otf \
+ FreeWay-Bold.otf \
$(NULL)
EXTRA_DIST =\
diff --git a/install/static/ipa.css b/install/static/ipa.css
index 42625ec7efe3c03c3b2d69d7cb2604389e315605..df138aa2f5ed1a38953e10bc83ebc3291c14a583 100644
--- a/install/static/ipa.css
+++ b/install/static/ipa.css
@@ -15,8 +15,8 @@ body{
margin: 0;
}
-...@font-face {font-family: "FreeWay"; src:url("fonts/FreeWay.otf");}
-...@font-face {font-family: "FreeWayBold"; src:url("fonts/FreeWay-Bold.otf");}
+...@font-face {font-family: "FreeWay"; src:url("FreeWay.otf");}
+...@font-face {font-family: "FreeWayBold"; src:url("FreeWay-Bold.otf");}
.input_link {
padding: .4em 1em .4em 2em;
diff --git a/ipa.spec.in b/ipa.spec.in
index 39817a699da18f424668ecee0b2b85d95c461e7b..b318712555c6c0c643cdf8ce5e2c86622ccbac09 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -400,6 +400,7 @@ fi
%{_usr}/share/ipa/static/*.png
%{_usr}/share/ipa/static/*.css
%{_usr}/share/ipa/static/*.js
+%{_usr}/share/ipa/static/*.otf
%dir %{_usr}/share/ipa/static/layouts
%dir %{_usr}/share/ipa/static/layouts/default
%{_usr}/share/ipa/static/layouts/default/*.html
--
1.7.3.4
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
