diff --git a/daps-0.9beta7.tar.bz2 b/daps-0.9beta7.tar.bz2 index 8c3b620..fc5defc 100644 --- a/daps-0.9beta7.tar.bz2 +++ b/daps-0.9beta7.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:054175f3fe1c827e1669d432f94bd816b6c15b7bd4328de29d81d7e09a7474e6 -size 759808 +oid sha256:9852eef9c1fc3546dc37efc25914b7d568f8f082e909eec5b852a47b78129715 +size 759589 diff --git a/daps.changes b/daps.changes index 8584a92..901c8fc 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Sep 26 15:36:46 UTC 2011 - fsundermeyer@opensuse.org + +- spec file changes so daps builds for SLE 11 / 11.1: + * checkbot is a recommendation for SLE + * require python-xml for < 1120 + * replace make_install macro with a literal make install call, + since 11.1/SLE 11 do not have the macro +- use the tar option --transform instead of --xform in order to be + compatible with older tar versions +- Bugfix Makefile: global option -d has been replaced with --debug + ------------------------------------------------------------------- Mon Sep 26 11:45:24 UTC 2011 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 31c3f05..43d5a51 100644 --- a/daps.spec +++ b/daps.spec @@ -67,20 +67,26 @@ BuildRequires: xmlformat BuildRequires: xmlstarlet BuildRequires: zip -%if %{suse_version} >= 1140 +%if 0%{?suse_version} >= 1140 BuildRequires: perl-checkbot BuildRequires: xmlgraphics-fop >= 0.94 %else +%if %{undefined sles_version} BuildRequires: checkbot +%endif BuildRequires: fop >= 0.94 BuildRequires: xerces-j2 -%if %{suse_version} == 1130 +%if 0%{?suse_version} == 1130 BuildRequires: xml-commons-jaxp-1.3-apis %endif -%if %{suse_version} < 1130 +%if 0%{?suse_version} < 1130 BuildRequires: xml-commons-apis-bootstrap %endif %endif +%if 0%{?suse_version} < 1120 +BuildRequires: python-xml +%endif + PreReq: libxml2 PreReq: sgml-skel @@ -114,20 +120,27 @@ Requires: xml-commons-resolver Requires: xmlformat Requires: xmlstarlet Requires: zip -%if %{suse_version} >= 1140 +%if 0%{?suse_version} >= 1140 Requires: perl-checkbot Requires: xmlgraphics-fop >= 0.94 %else -Requires: checkbot +%if 0%{?sles_version} +Recommends: checkbot +%else +Requires: checkbot +%endif Requires: fop >= 0.94 Requires: xerces-j2 -%if %{suse_version} == 1130 +%if 0%{?suse_version} == 1130 Requires: xml-commons-jaxp-1.3-apis %endif -%if %{suse_version} < 1130 +%if 0%{?suse_version} < 1130 Requires: xml-commons-apis-bootstrap %endif %endif +%if 0%{?suse_version} < 1120 +BuildRequires: python-xml +%endif Recommends: agfa-fonts Recommends: aspell aspell-en aspell-en-huge @@ -175,12 +188,15 @@ for upgrade instructions. #-------------------------------------------------------------------------- %build # specifying VERSION is manadatory!! -%__make VERSION=%{version} %{?_smp_mflags} +%__make %{?_smp_mflags} VERSION=%{version} #-------------------------------------------------------------------------- %install # specifying VERSION is manadatory!! -%make_install VERSION=%{version} %{?_smp_mflags} +make install DESTDIR=$RPM_BUILD_ROOT VERSION=%{version} + +# make_install macro does not have a DESTDIR in 11.1/SLE 11 !! +#%#make_install VERSION=%{version} # create symlinks: %fdupes -s $RPM_BUILD_ROOT/%{_datadir}