[packages/tk-BWidget] - rpm doesn't like macro named package

draenog draenog at pld-linux.org
Thu Aug 30 06:11:59 CEST 2012


commit a8d691431280ec5e4f6bb25ee1c6a5ee9f0e0897
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Thu Aug 30 05:10:58 2012 +0100

    - rpm doesn't like macro named package

 tk-BWidget.spec | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/tk-BWidget.spec b/tk-BWidget.spec
index 5b262f8..9fe4352 100644
--- a/tk-BWidget.spec
+++ b/tk-BWidget.spec
@@ -1,4 +1,4 @@
-%define		package	bwidget
+%define		packagename		bwidget
 Summary:	High-level Widget Set for Tcl/Tk
 Summary(pl.UTF-8):	Wysokopoziomowy zestaw widgetów dla Tcl/Tk
 Name:		tk-BWidget
@@ -45,10 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 # Don't bother with the included configure script and Makefile.  They
 # are missing a lot of pieces and won't work at all.  Installation is
 # pretty simple, so we can just do it here manually.
-install -d $RPM_BUILD_ROOT%{tcl_sitelib}/%{package}%{version}/{lang,images}
-cp -a *.tcl $RPM_BUILD_ROOT%{tcl_sitelib}/%{package}%{version}
-cp -a lang/*.rc $RPM_BUILD_ROOT%{tcl_sitelib}/%{package}%{version}/lang
-cp -a images/*.gif images/*.xbm $RPM_BUILD_ROOT%{tcl_sitelib}/%{package}%{version}/images
+install -d $RPM_BUILD_ROOT%{tcl_sitelib}/%{packagename}%{version}/{lang,images}
+cp -a *.tcl $RPM_BUILD_ROOT%{tcl_sitelib}/%{packagename}%{version}
+cp -a lang/*.rc $RPM_BUILD_ROOT%{tcl_sitelib}/%{packagename}%{version}/lang
+cp -a images/*.gif images/*.xbm $RPM_BUILD_ROOT%{tcl_sitelib}/%{packagename}%{version}/images
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -59,17 +59,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt ChangeLog LICENSE.txt README.txt BWman/*.html
-%dir %{tcl_sitelib}/%{package}%{version}
-%{tcl_sitelib}/%{package}%{version}/*.tcl
-%{tcl_sitelib}/%{package}%{version}/images
-%dir %{tcl_sitelib}/%{package}%{version}/lang
-%{tcl_sitelib}/%{package}%{version}/lang/en.rc
-%lang(da) %{tcl_sitelib}/%{package}%{version}/lang/da.rc
-%lang(de) %{tcl_sitelib}/%{package}%{version}/lang/de.rc
-%lang(es) %{tcl_sitelib}/%{package}%{version}/lang/es.rc
-%lang(fr) %{tcl_sitelib}/%{package}%{version}/lang/fr.rc
-%lang(hu) %{tcl_sitelib}/%{package}%{version}/lang/hu.rc
-%lang(nl) %{tcl_sitelib}/%{package}%{version}/lang/nl.rc
-%lang(nb) %{tcl_sitelib}/%{package}%{version}/lang/no.rc
-%lang(pl) %{tcl_sitelib}/%{package}%{version}/lang/pl.rc
+%dir %{tcl_sitelib}/%{packagename}%{version}
+%{tcl_sitelib}/%{packagename}%{version}/*.tcl
+%{tcl_sitelib}/%{packagename}%{version}/images
+%dir %{tcl_sitelib}/%{packagename}%{version}/lang
+%{tcl_sitelib}/%{packagename}%{version}/lang/en.rc
+%lang(da) %{tcl_sitelib}/%{packagename}%{version}/lang/da.rc
+%lang(de) %{tcl_sitelib}/%{packagename}%{version}/lang/de.rc
+%lang(es) %{tcl_sitelib}/%{packagename}%{version}/lang/es.rc
+%lang(fr) %{tcl_sitelib}/%{packagename}%{version}/lang/fr.rc
+%lang(hu) %{tcl_sitelib}/%{packagename}%{version}/lang/hu.rc
+%lang(nl) %{tcl_sitelib}/%{packagename}%{version}/lang/nl.rc
+%lang(nb) %{tcl_sitelib}/%{packagename}%{version}/lang/no.rc
+%lang(pl) %{tcl_sitelib}/%{packagename}%{version}/lang/pl.rc
 %{_examplesdir}/%{name}-%{version}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tk-BWidget.git/commitdiff/a8d691431280ec5e4f6bb25ee1c6a5ee9f0e0897



More information about the pld-cvs-commit mailing list