- catch errors

[packages/rpm-build-macros.git] / rpm-build-macros.spec

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index c38136a06d030b100b8ddb1d2534e71e17dcbc94..23f0e14f52d66110320fd96fb91907393a0be3a6 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,63 +1,55 @@
-# NOTE:
-# - AC-branch is TAG. please move the tag if rebuild needed:
-%if 0
-cvs up -A rpm-macros.spec
-cvs tag -F AC-branch rpm-macros.spec
-./builder -r AC-branch -bb rpm-macros.spec
-%endif
-# TODO
-# - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc
-#   for it to search the macrofile from there.
-# - commit debuginfo.patch to rpm.macros
-%define        rpm_macros_rev  1.253
-Summary:       PLD Linux RPM Macros
-Summary(pl):   Makra RPM dla Linuksa PLD
-Name:          rpm-macros
+%define                rpm_macros_rev 1.391
+Summary:       PLD Linux RPM build macros
+Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
+Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       1.2
+Release:       1
 License:       GPL
-Group:         Base
+Group:         Development/Building
 Source0:       rpm.macros
-Patch0:                %{name}-debuginfo.patch
-Requires:      rpm-build
+Source1:       service_generator.sh
+Source2:       rpm-build.sh
+Requires:      findutils >= 1:4.2.26
 Provides:      rpmbuild(macros) = %{rpm_macros_rev}
-Provides:      rpm-build-macros
-Conflicts:     rpm < 4.4.1
+Obsoletes:     rpm-macros
+Conflicts:     gettext-devel < 0.11
+# for _x_libraries macro
+Conflicts:     rpm < 4.4.2-27.1
+# php-config --sysconfdir
+Conflicts:     php-devel < 4:5.2.0-3
+Conflicts:     php4-devel < 3:4.4.4-10
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _rpmlibdir /usr/lib/rpm
+%define                _rpmlibdir %{_prefix}/lib/rpm
 
 %description
-This package contains rpm macros for PLD Linux.
+This package contains rpm build macros for PLD Linux.
 
-Use this package to get newer rpm macros than rpm-build provides
-(perhaps this package will be separated in the future).
-
-%description -l pl
-Ten pakiet zawiera makra rpm-a dla Linuksa PLD.
-
-Mo¿na u¿yæ tego pakietu aby uzyskaæ nowsze makra rpm-a ni¿ dostarcza
-rpm-build (byæ mo¿e ten pakiet zostanie w przysz³o¶ci wydzielony).
+%description -l pl.UTF-8
+Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
 %setup -qcT
-install %{SOURCE0} macros.in
-%patch0 -p1
+cp %{SOURCE0} rpm.macros
+rev=$(awk '/^#.*Revision:.*Date/{print $3}' rpm.macros)
+if [ "$rev" != "%rpm_macros_rev" ]; then
+       : Update rpm_macros_rev define to $rev, and retry
+       exit 1
+fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/rpm,%{_rpmlibdir}}
-sed -e '
-# truncate until %%_topdir macro
-1,/^%%_topdir/d
-' macros.in > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pld
-cp macros.in $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
+cp rpm.macros $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+install %{SOURCE1} $RPM_BUILD_ROOT%{_rpmlibdir}/service_generator.sh
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-#%{_sysconfdir}/rpm/*
-%{_rpmlibdir}/*
+%{_rpmlibdir}/macros.build
+%attr(755,root,root) %{_rpmlibdir}/service_generator.sh
+/etc/shrc.d/rpm-build.sh