[4.0-3]

- added using macros
- fixed pl translations
- 'install -d' is called only once

Changed files:
    asWedit.spec -> 1.12

diff --git a/asWedit.spec b/asWedit.spec
index 51bf1dac5b1cf2acb20c998f826cf06d635df374..366b1f6c119f40b103213c25ebd57c0eec40dad6 100644 (file)
--- a/asWedit.spec
+++ b/asWedit.spec
@@ -1,29 +1,32 @@
-Summary:       Text and HTML editor
-Summary(pl):   Edytor tekstowy i HTML
-Name:          asWedit
-Version:       4.0
-Copyright:     Non-commercially distributable
-Group:         Applications/Editors
-Group(pl):     Aplikacje/Edytory
-Release:       2
-######         http://www.advasoft.com/asWedit
-Source0:        %{name}-%{version}-i386.linux.tar.gz
-######         http://www.advasoft.com/asWedit/i18n-resources
-Source1:       AsWedit-%{version}-cz.tar.gz
-Source2:       AsWedit-%{version}-da.tar.gz
-Source3:       AsWedit-%{version}-de.tar.gz
-Source4:       AsWedit-%{version}-en.tar.gz
-Source5:       AsWedit-%{version}-es.tar.gz
-Source6:       AsWedit-%{version}-fr.tar.gz
-Source7:       AsWedit-%{version}-nl.tar.gz
-Source8:       AsWedit-%{version}-pl.tar.gz
-Source9:       AsWedit-%{version}-pt.tar.gz
-Source10:      AsWedit-%{version}-sv.tar.gz
-Source11:      %{name}.wmconfig
-Patch:         %{name}-helpDir.patch
-Requires:      libc
+Summary:       Text and HTML editor
+Summary(pl):   Edytor tekstu i HTML
+Name:          asWedit
+Version:       4.0
+Copyright:     Non-commercially distributable
+Group:         Applications/Editors
+Group(pl):     Aplikacje/Edytory
+Release:       2
+######         http://www.advasoft.com/asWedit
+Source0:       %{name}-%{version}-i386.linux.tar.gz
+######         http://www.advasoft.com/asWedit/i18n-resources
+Source1:       AsWedit-%{version}-cz.tar.gz
+Source2:       AsWedit-%{version}-da.tar.gz
+Source3:       AsWedit-%{version}-de.tar.gz
+Source4:       AsWedit-%{version}-en.tar.gz
+Source5:       AsWedit-%{version}-es.tar.gz
+Source6:       AsWedit-%{version}-fr.tar.gz
+Source7:       AsWedit-%{version}-nl.tar.gz
+Source8:       AsWedit-%{version}-pl.tar.gz
+Source9:       AsWedit-%{version}-pt.tar.gz
+Source10:      AsWedit-%{version}-sv.tar.gz
+Source11:      %{name}.wmconfig
+Patch:         %{name}-helpDir.patch

 BuildRoot:     /tmp/%{name}-%{version}-root
 BuildRoot:     /tmp/%{name}-%{version}-root

-ExclusiveArch: %{ix86}
+Requires:      libc
+ExclusiveArch: %{ix86}
+
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man

 
 %description
 asWedit is powerful editor for text file and HTML pages. It contains
 
 %description
 asWedit is powerful editor for text file and HTML pages. It contains


@@ -31,7 +34,7 @@ syntax highlighting and HTML 4.0 validating.
 
 %description -l pl
 AsWedit jest edytorem plików tekstowych i HTML. Bardzo ³adnie pod¶wietla
 
 %description -l pl
 AsWedit jest edytorem plików tekstowych i HTML. Bardzo ³adnie pod¶wietla

-sk³adnie HTML i co wa¿niejsze nie pozwala na tworzenie niezgodnych ze 
+sk³adniê HTML i, co wa¿niejsze, nie pozwala na tworzenie niezgodnych ze 

 specyfikacj± HTML 4.0 stron WWW.
 
 %prep
 specyfikacj± HTML 4.0 stron WWW.
 
 %prep


@@ -43,24 +46,24 @@ specyfikacj
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-install -d $RPM_BUILD_ROOT/usr/X11R6/{bin,lib/X11/app-defaults}
-install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/{cz,da,de,en,es,fr,nl,pl,pt,sv}/app-defaults
-install -d $RPM_BUILD_ROOT/etc/X11/wmconfig
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/X11/app-defaults} \
+  $RPM_BUILD_ROOT%{_libdir}/X11/{cz,da,de,en,es,fr,nl,pl,pt,sv}/app-defaults \
+  $RPM_BUILD_ROOT/etc/X11/wmconfig

 
 

-install  -s asWedit $RPM_BUILD_ROOT/usr/X11R6/bin/asWedit
-install  asWedit.hlp $RPM_BUILD_ROOT/usr/X11R6/lib/asWedit.hlp
+install  -s asWedit $RPM_BUILD_ROOT%{_bindir}/asWedit
+install  asWedit.hlp $RPM_BUILD_ROOT%{_libdir}/asWedit.hlp

 
 

-install  AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/AsWedit
-install  cz/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/cz/app-defaults/AsWedit
-install  da/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/da/app-defaults/AsWedit
-install  de/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/de/app-defaults/AsWedit
-install  en/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/en/app-defaults/AsWedit
-install  es/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/es/app-defaults/AsWedit
-install  fr/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fr/app-defaults/AsWedit
-install  nl/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/nl/app-defaults/AsWedit
-install  pl/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/pl/app-defaults/AsWedit
-install  pt/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/pt/app-defaults/AsWedit
-install  sv/AsWedit $RPM_BUILD_ROOT/usr/X11R6/lib/X11/sv/app-defaults/AsWedit
+install  AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/AsWedit
+install  cz/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/cz/app-defaults/AsWedit
+install  da/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/da/app-defaults/AsWedit
+install  de/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/de/app-defaults/AsWedit
+install  en/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/en/app-defaults/AsWedit
+install  es/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/es/app-defaults/AsWedit
+install  fr/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/fr/app-defaults/AsWedit
+install  nl/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/nl/app-defaults/AsWedit
+install  pl/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/pl/app-defaults/AsWedit
+install  pt/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/pt/app-defaults/AsWedit
+install  sv/AsWedit $RPM_BUILD_ROOT%{_libdir}/X11/sv/app-defaults/AsWedit

 install  %{SOURCE11} $RPM_BUILD_ROOT/etc/X11/wmconfig/asWedit
 
 %clean
 install  %{SOURCE11} $RPM_BUILD_ROOT/etc/X11/wmconfig/asWedit
 
 %clean


@@ -69,19 +72,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)
 

-%attr(755,root,root) /usr/X11R6/bin/asWedit
-/usr/X11R6/lib/asWedit.hlp
-/usr/X11R6/lib/X11/app-defaults/AsWedit
+%attr(755,root,root) %{_bindir}/asWedit
+%{_libdir}/asWedit.hlp
+%{_libdir}/X11/app-defaults/AsWedit

 
 %config(missingok) /etc/X11/wmconfig/*
 
 
 %config(missingok) /etc/X11/wmconfig/*
 

-%lang(cz) /usr/X11R6/lib/X11/cz/app-defaults/AsWedit
-%lang(da) /usr/X11R6/lib/X11/da/app-defaults/AsWedit
-%lang(de) /usr/X11R6/lib/X11/de/app-defaults/AsWedit
-%lang(en) /usr/X11R6/lib/X11/en/app-defaults/AsWedit
-%lang(es) /usr/X11R6/lib/X11/es/app-defaults/AsWedit
-%lang(fr) /usr/X11R6/lib/X11/fr/app-defaults/AsWedit
-%lang(nl) /usr/X11R6/lib/X11/nl/app-defaults/AsWedit
-%lang(pl) /usr/X11R6/lib/X11/pl/app-defaults/AsWedit
-%lang(pt) /usr/X11R6/lib/X11/pt/app-defaults/AsWedit
-%lang(sv) /usr/X11R6/lib/X11/sv/app-defaults/AsWedit
+%lang(cz) %{_libdir}/X11/cz/app-defaults/AsWedit
+%lang(da) %{_libdir}/X11/da/app-defaults/AsWedit
+%lang(de) %{_libdir}/X11/de/app-defaults/AsWedit
+%lang(en) %{_libdir}/X11/en/app-defaults/AsWedit
+%lang(es) %{_libdir}/X11/es/app-defaults/AsWedit
+%lang(fr) %{_libdir}/X11/fr/app-defaults/AsWedit
+%lang(nl) %{_libdir}/X11/nl/app-defaults/AsWedit
+%lang(pl) %{_libdir}/X11/pl/app-defaults/AsWedit
+%lang(pt) %{_libdir}/X11/pt/app-defaults/AsWedit
+%lang(sv) %{_libdir}/X11/sv/app-defaults/AsWedit