- tidy up the specfile per rpmlint comments

This commit is contained in:
Petr Machata 2007-02-07 19:47:13 +00:00
parent a8ffe45ce8
commit 2ee243f4a5

View File

@ -3,14 +3,15 @@ Name: tzdata
Version: 2007a Version: 2007a
%define tzdata_version %{version} %define tzdata_version %{version}
%define tzcode_version %{version} %define tzcode_version %{version}
Release: 1%{?dist} Release: 2%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
URL: ftp://elsie.nci.nih.gov/pub/
Source0: tzdata-base-0.tar.bz2 Source0: tzdata-base-0.tar.bz2
Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gawk, glibc, glibc-common, perl BuildRequires: gawk, glibc, perl
BuildRequires: glibc-common >= 2.5.90-7 BuildRequires: glibc-common >= 2.5.90-7
Conflicts: glibc-common <= 2.3.2-63 Conflicts: glibc-common <= 2.3.2-63
BuildArchitectures: noarch BuildArchitectures: noarch
@ -20,14 +21,13 @@ This package contains data files with rules for various timezones around
the world. the world.
%prep %prep
%setup -n tzdata %setup -q -n tzdata
mkdir tzdata%{tzdata_version} mkdir tzdata%{tzdata_version}
tar xzf %{SOURCE1} -C tzdata%{tzdata_version} tar xzf %{SOURCE1} -C tzdata%{tzdata_version}
mkdir tzcode%{tzcode_version} mkdir tzcode%{tzcode_version}
tar xzf %{SOURCE2} -C tzcode%{tzcode_version} tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
sed -e 's|@objpfx@|'`pwd`'/obj/|' \ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-e 's|@datadir@|%{_datadir}|' \ -e 's|@datadir@|%{_datadir}|' \
-e 's|@install_root@|%{buildroot}|' \
Makeconfig.in > Makeconfig Makeconfig.in > Makeconfig
%build %build
@ -35,6 +35,8 @@ make
grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html
%install %install
rm -fr $RPM_BUILD_ROOT
sed -i 's|@install_root@|%{buildroot}|' Makeconfig
make install make install
%check %check
@ -53,6 +55,9 @@ rm -rf %{buildroot}
%doc tzcode%{tzcode_version}/tz-link.html %doc tzcode%{tzcode_version}/tz-link.html
%changelog %changelog
* Wed Feb 7 2007 Petr Machata <pmachata@redhat.com> - 2007a-2
- tidy up the specfile per rpmlint comments
* Thu Jan 18 2007 Petr Machata <pmachata@redhat.com> - 2007a-1 * Thu Jan 18 2007 Petr Machata <pmachata@redhat.com> - 2007a-1
- Upstream 2007a - Upstream 2007a
- Updates to Bahamas, they will be in sync with 2007 US DST change - Updates to Bahamas, they will be in sync with 2007 US DST change
@ -215,7 +220,7 @@ rm -rf %{buildroot}
* Thu Mar 17 2005 Jakub Jelinek <jakub@redhat.com> 2005g-2 * Thu Mar 17 2005 Jakub Jelinek <jakub@redhat.com> 2005g-2
- 2005g - 2005g
- fixes for Uruguay - fixes for Uruguay
- include README and Theory from tzcode tarball in %{_docdir}; - include README and Theory from tzcode tarball in %%{_docdir};
Theory includes a good summary of how the timezone data files Theory includes a good summary of how the timezone data files
are supposed to be named are supposed to be named