[packages/jquery-twitter-bootstrap] simplify packaging

glen glen at pld-linux.org
Wed Mar 26 16:04:19 CET 2014


commit 4ee5ed1f7db9ebe4198469a17e3d560086fa8caa
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 26 17:04:16 2014 +0200

    simplify packaging

 jquery-twitter-bootstrap.spec | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/jquery-twitter-bootstrap.spec b/jquery-twitter-bootstrap.spec
index b601298..9581286 100644
--- a/jquery-twitter-bootstrap.spec
+++ b/jquery-twitter-bootstrap.spec
@@ -14,7 +14,7 @@ Source0:	http://getbootstrap.com/%{version}/assets/bootstrap.zip?/%{plugin}-%{ve
 # Source0-md5:	2b2df1b111dfb560e7b0a1f1b8e0743a
 URL:		http://twitter.github.io/bootstrap/
 BuildRequires:	unzip
-Requires:	jquery >= 1.7
+Requires:	jquery >= 1.8
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,30 +28,31 @@ easier web development.
 
 %prep
 %setup -qc
+mv %{altname}/* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}/{js,css}
 
-cp -p %{altname}/js/%{altname}.js $RPM_BUILD_ROOT%{_appdir}/js/%{altname}-%{version}.js
-cp -p %{altname}/js/%{altname}.min.js $RPM_BUILD_ROOT%{_appdir}/js/%{altname}-%{version}.min.js
+cp -p js/%{altname}.js $RPM_BUILD_ROOT%{_appdir}/js/%{altname}-%{version}.js
+cp -p js/%{altname}.min.js $RPM_BUILD_ROOT%{_appdir}/js/%{altname}-%{version}.min.js
 ln -s %{altname}-%{version}.js $RPM_BUILD_ROOT%{_appdir}/js/%{altname}.src.js
 ln -s %{altname}-%{version}.min.js $RPM_BUILD_ROOT%{_appdir}/js/%{altname}.js
 ln -s %{altname}-%{version}.min.js $RPM_BUILD_ROOT%{_appdir}/js/%{altname}.min.js
 
-cp -p %{altname}/css/%{altname}.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-%{version}.css
-cp -p %{altname}/css/%{altname}.min.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-%{version}.min.css
+cp -p css/%{altname}.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-%{version}.css
+cp -p css/%{altname}.min.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-%{version}.min.css
 ln -s %{altname}-%{version}.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}.src.css
 ln -s %{altname}-%{version}.min.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}.css
 ln -s %{altname}-%{version}.min.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}.min.css
 
-cp -p %{altname}/css/%{altname}-responsive.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-responsive-%{version}.css
-cp -p %{altname}/css/%{altname}-responsive.min.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-responsive-%{version}.min.css
+cp -p css/%{altname}-responsive.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-responsive-%{version}.css
+cp -p css/%{altname}-responsive.min.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-responsive-%{version}.min.css
 ln -s %{altname}-responsive-%{version}.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-responsive.src.css
 ln -s %{altname}-responsive-%{version}.min.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-responsive.css
 ln -s %{altname}-responsive-%{version}.min.css $RPM_BUILD_ROOT%{_appdir}/css/%{altname}-responsive.min.css
 
-cp -a %{altname}/img $RPM_BUILD_ROOT%{_appdir}
+cp -a img $RPM_BUILD_ROOT%{_appdir}
 
 %if %{with default}
 ln -s $(basename %{_appdir}) $RPM_BUILD_ROOT%{jquerydir}/%{altname}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jquery-twitter-bootstrap.git/commitdiff/4ee5ed1f7db9ebe4198469a17e3d560086fa8caa



More information about the pld-cvs-commit mailing list