From 5512b2d62bc1e5fc38c9853834487a97c6c99cf8 Mon Sep 17 00:00:00 2001 From: Gregory Leblanc Date: Tue, 20 Mar 2001 21:36:02 +0000 Subject: use RPM defined macros, remove hard-coded paths, add build requirement for 2001-03-20 Gregory Leblanc * gnome-user-docs.spec.in: use RPM defined macros, remove hard-coded paths, add build requirement for scrollkeeper --- ChangeLog | 6 ++++++ gnome-user-docs.spec.in | 31 ++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45065a0..5f5f623 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-03-20 Gregory Leblanc + + * gnome-user-docs.spec.in: use RPM defined macros, remove + hard-coded paths, add build requirement for scrollkeeper + + 2001-03-19 Dan Mueth * configure.in: Incrementing version to 1.4.0dev1 diff --git a/gnome-user-docs.spec.in b/gnome-user-docs.spec.in index e138e4c..1f5238e 100644 --- a/gnome-user-docs.spec.in +++ b/gnome-user-docs.spec.in @@ -4,10 +4,6 @@ %define ver @VERSION@ %define RELEASE 1 %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} -%define prefix /usr -%define mandir /usr/man -%define datadir /usr/share -%define sysconfdir /etc %define localstatedir /var/lib @@ -21,6 +17,7 @@ Source: %{name}-%{version}.tar.gz Group: Documentation BuildArch: noarch BuildRoot: /var/tmp/%{name}-%{ver}-root +BuildRequires: scrollkeeper %description This package contains general GNOME user documentation which is not @@ -29,16 +26,19 @@ directly associated with any particular GNOME application or package. %prep %setup %build -./configure --prefix %{prefix} +./configure --prefix %{_prefix} datadir=%{_datadir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ + sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \ + localstatedir=$RPM_BUILD_ROOT%{localstatedir} make %install rm -rf $RPM_BUILD_ROOT -make prefix=$RPM_BUILD_ROOT%{prefix} \ - datadir=$RPM_BUILD_ROOT%{datadir} \ - mandir=$RPM_BUILD_ROOT%{mandir} \ - sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} \ - localstatedir=$RPM_BUILD_ROOT%{localstatedir} install +make prefix=$RPM_BUILD_ROOT%{_prefix} \ + datadir=$RPM_BUILD_ROOT%{_datadir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ + sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \ + localstatedir=$RPM_BUILD_ROOT%{localstatedir} install %clean @@ -53,11 +53,16 @@ if which scrollkeeper-udpate>/dev/null 2>&1; then scrollkeeper-udpate; fi %files %defattr(-, root, root) %doc COPYING COPYING-DOCS AUTHORS README ChangeLog NEWS INSTALL -%{prefix}/share/gnome/help -%{datadir}/omf/%{name} +%{_datadir}/gnome/help +%{_datadir}/omf/%{name} -%changelog +%changelog +* Tue Mar 20 2001 Gregory Leblanc +- use RPM defined macros, remove hard-coded paths, add build + requirement for scrollkeeper + * Sun Mar 11 2001 Dan Mueth - Update as we move to its own module + * Mon Nov 27 2000 Kenny Graunke - Initial cut -- cgit