- avoid defining default %attr

Changed files:
    openjade.spec -> 1.68

diff --git a/openjade.spec b/openjade.spec
index fa60e634c0fb636f4c386b988a2f513d1775c6c5..de2d4a937754bf6433f3ff7b874766c5cc0b533f 100644 (file)
--- a/openjade.spec
+++ b/openjade.spec
@@ -13,8 +13,8 @@ Patch0:               %{name}-nls-from-1.4.patch
 URL:           http://openjade.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
 BuildRequires: gettext-devel
+BuildRequires: libtool
 BuildRequires: opensp-devel >= 2:1.5.1
 BuildRequires: perl-base
 Requires(post,postun): /sbin/ldconfig
@@ -22,10 +22,10 @@ Requires(post,postun):      sgml-common
 Requires:      opensp >= 1.5-2
 Requires:      sgml-common
 Requires:      sgmlparser
-Provides:      jade
 Provides:      dssslparser
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:      jade
 Obsoletes:     jade
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                sgmldir         /usr/share/sgml
 %define                _datadir        %{sgmldir}/%{name}-%{version}
@@ -42,8 +42,8 @@ jest nast
 Summary:       OpenJade header files
 Summary(pl):   Pliki nag³ówkowe do bibliotek OpenJade
 Group:         Development/Libraries
-Prereq:                /sbin/ldconfig
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      /sbin/ldconfig
 
 %description devel
 Openjade header files.
@@ -64,7 +64,7 @@ OpenJade static libraries.
 Biblioteki statyczne OpenJade.
 
 %prep
-%setup -q -n openjade-%{version}-pre%{pre}
+%setup -q -n %{name}-%{version}-pre%{pre}
 %patch -p1
 
 %build
@@ -77,8 +77,8 @@ tail -n +3349 config/aclocal.m4 | head -n 64 > acinclude.m4
 %{__aclocal}
 %{__autoconf}
 %configure \
-       --enable-default-catalog=/etc/sgml/catalog \
-       --enable-default-search-path=/usr/share/sgml \
+--enable-default-catalog=%{_sysconfdir}/sgml/catalog \
+--enable-default-search-path=%{_prefix}/share/sgml \
        --enable-mif \
        --enable-html \
        --enable-threads \
@@ -88,7 +88,7 @@ tail -n +3349 config/aclocal.m4 | head -n 64 > acinclude.m4
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{sgmldir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT%{_datadir}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -99,7 +99,7 @@ ln -sf openjade $RPM_BUILD_ROOT%{_bindir}/jade
 
 # files present in openjade 1.4
 install dsssl/{catalog,dsssl.dtd,extensions.dsl,fot.dtd,style-sheet.dtd} \
-       $RPM_BUILD_ROOT%{sgmldir}/%{name}-%{version}
+$RPM_BUILD_ROOT%{_datadir}
 install -d $RPM_BUILD_ROOT%{_includedir}/OpenJade
 install include/*.h grove/Node.h spgrove/{GroveApp,GroveBuilder}.h \
        style/{DssslApp,FOTBuilder}.h $RPM_BUILD_ROOT%{_includedir}/OpenJade
@@ -111,22 +111,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-if ! grep -q /etc/sgml/openjade.cat /etc/sgml/catalog ; then
-       /usr/bin/install-catalog --add /etc/sgml/openjade.cat \
-               %{sgmldir}/%{name}-%{version}/catalog
-elif grep -sq /usr/share/OpenJade/catalog /etc/sgml/openjade.cat ; then
+if ! grep -q %{_sysconfdir}/sgml/openjade.cat %{_sysconfdir}/sgml/catalog ; then
+%{_bindir}/install-catalog --add %{_sysconfdir}/sgml/openjade.cat \
+%{_datadir}/catalog
+elif grep -sq %{_prefix}/share/OpenJade/catalog %{_sysconfdir}/sgml/openjade.cat ; then
        # upgrade
-       /usr/bin/install-catalog --remove /etc/sgml/openjade.cat \
-               /usr/share/OpenJade/catalog
-       /usr/bin/install-catalog --add /etc/sgml/openjade.cat \
-               %{sgmldir}/%{name}-%{version}/catalog
+%{_bindir}/install-catalog --remove %{_sysconfdir}/sgml/openjade.cat \
+%{_prefix}/share/OpenJade/catalog
+%{_bindir}/install-catalog --add %{_sysconfdir}/sgml/openjade.cat \
+%{_datadir}/catalog
 fi
 
 %postun
 /sbin/ldconfig
 if [ "$1" = "0" ] ; then
-       /usr/bin/install-catalog --remove /etc/sgml/openjade.cat \
-               %{sgmldir}/%{name}-%{version}/catalog
+%{_bindir}/install-catalog --remove %{_sysconfdir}/sgml/openjade.cat \
+%{_datadir}/catalog
 fi
 
 %files -f jade.lang
@@ -134,7 +134,7 @@ fi
 %doc COPYING ChangeLog NEWS README doc/*.htm jadedoc
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{sgmldir}/%{name}-%{version}
+%{_datadir}
 
 %files devel
 %defattr(644,root,root,755)
@@ -144,4 +144,4 @@ fi
 
 %files static
 %defattr(644,root,root,755)
-%attr(644,root,root) %{_libdir}/lib*.a
+%{_libdir}/lib*.a