Author: twittner Date: Tue Mar 7 17:41:12 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - added rpm-doxygen_no_file.patch: fix for rpm-apidocs package (was empty) - shortened path in rpm-apidocs - rel. 30, STBR AC
---- Files affected: SPECS: rpm.spec (1.555.2.164 -> 1.555.2.165) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.555.2.164 SPECS/rpm.spec:1.555.2.165 --- SPECS/rpm.spec:1.555.2.164 Fri Feb 17 16:22:58 2006 +++ SPECS/rpm.spec Tue Mar 7 18:41:07 2006 @@ -31,7 +31,7 @@ Name: rpm %define sover 4.4 Version: 4.4.2 -Release: 29 +Release: 30 License: GPL Group: Base Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz @@ -108,6 +108,7 @@ Patch50: %{name}-macros.patch Patch51: %{name}-cleanlibdirs.patch Patch52: %{name}-dep_whiteout.patch +Patch53: %{name}-doxygen_no_file.patch URL: http://wraptastic.org/ BuildRequires: autoconf >= 2.52 BuildRequires: automake @@ -686,6 +687,10 @@ %patch52 -p1 %patch0 -p1 %patch3 -p1 +%if %{with system_libmagic} +rm -rf file +%patch53 -p1 +%endif cd scripts mv -f perl.req perl.req.in @@ -707,9 +712,7 @@ done %build -%if %{with system_libmagic} -rm -rf file -%else +%if ! %{with system_libmagic} cd file %{__libtoolize} %{__aclocal} @@ -1145,7 +1148,7 @@ %if %{with apidocs} %files apidocs %defattr(644,root,root,755) -%doc apidocs +%doc apidocs/html/* %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -1154,6 +1157,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.555.2.165 2006/03/07 17:41:07 twittner +- added rpm-doxygen_no_file.patch: fix for rpm-apidocs + package (was empty) +- shortened path in rpm-apidocs +- rel. 30, STBR AC + Revision 1.555.2.164 2006/02/17 15:22:58 glen - remove .packlist and perllocal.pod for perl packages, rel 29 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.164&r2=1.555.2.165&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
