aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2005-05-08 15:57:01 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2005-05-08 15:57:01 +0000
commit83e026939e019f3d4b7c8baf92f44afdb78b1f92 (patch)
tree5fd714ac1d7576a2846058becb06fdf3a076b606
parentb9d474f190f9da93b83730fff5af2428fa7701e9 (diff)
- add make ChangeLogv0_40.4
- 0.4 final
-rw-r--r--ChangeLog72
-rw-r--r--Makefile.am8
-rw-r--r--rpm-mandriva-setup.spec1
-rw-r--r--rpmrc.in1
4 files changed, 81 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e69de29..521742a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,72 @@
+2005-05-06 10:11 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, rpm-mandriva-setup.spec: - 0.4
+
+2005-05-06 10:07 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * rpmpopt: - fix popt alias
+
+2005-05-06 06:57 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: build_sysmacrospath take %name if no name
+
+2005-05-03 10:19 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * ltmain.sh, rpm-mandriva-setup.spec: - 0.3
+
+2005-05-03 10:06 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am, rpm-mandriva-setup.spec, rpm-spec-mode.el, rpmrc.in:
+ - add emacs mode spec - update requres - read /etc/rpm/macros.*
+
+2005-05-01 23:51 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, rpm-mandriva-setup.spec: - in way to 0.3
+
+2005-05-01 23:46 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * rpm-mandriva-setup.spec: - 0.2
+
+2005-05-01 23:45 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, make_macrosfiles.sh.in, rpm-mandriva-setup.spec: -
+ fix optflags
+
+2005-05-01 02:44 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * rpmpopt: - really add rpmpopt
+
+2005-05-01 02:41 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am, configure.ac, macros-perarch.in, macros.in,
+ make_macrosfiles.sh.in, rpmrc.in: - add rpmpopt - fix optflags in
+ macros
+
+2005-04-29 05:14 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am, Makefile.in, brp-compress, brp-strip-static-archive,
+ configure.ac, http.req, macros.in, magic.prov, magic.req,
+ perl.prov, perl.req, rpm-mandriva-setup.spec, rpmrc.in: - remove
+ Makefile.in from cvs - more scripts - version is 0.1 (in way) -
+ use spec-helper at time
+
+2005-04-28 20:16 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am, Makefile.in, macros.in, rpmrc.in: - update mkrel -
+ include rpm rpmrc in our rpmrc - minor fixes
+
+2005-04-27 04:06 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * find-requires.in, find-provides.in: - fix tr call for mono
+ req/prov
+
+2005-04-27 01:25 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * AUTHORS, COPYING, INSTALL, Makefile.am, Makefile.in, NEWS,
+ README, brp-compress, brp-strip, brp-strip-comment-note,
+ configure.ac, filter.sh, find-debuginfo.sh, find-lang.sh,
+ find-provides.in, find-provides.perl.in, find-requires.in,
+ install-sh, ltmain.sh, macros-perarch.in, macros.in,
+ make_macrosfiles.sh.in, rpm-mandriva-setup.spec, rpmrc.in: -
+ import
+
diff --git a/Makefile.am b/Makefile.am
index d53192c..537cd69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,10 +73,16 @@ install-data-local: $(macrosfiles)
done
.PHONY: rpm
-rpm: dist
+rpm: dist-bzip2
gzip -dc $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz | bzip2 > $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
rpmbuild -ba --define "_sourcedir `pwd`" rpm-mandriva-setup.spec
+.PHONY: ChangeLog
+ChangeLog:
+ cvs2cl -W 400 -I ChangeLog --accum -U ../common/username
+ rm -f *.bak
+
+
CLEANFILES = $(pkg_gdata) $(pkg_gscripts) $(macrosfiles) \
macros-perarch \
make_macrosfiles.sh
diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec
index 0e54223..9ef4234 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -34,6 +34,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
+%doc ChangeLog
%_prefix/lib/rpm/mandriva
%dir %{_sysconfdir}/rpm/macros.d
diff --git a/rpmrc.in b/rpmrc.in
index 3593316..8791208 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -3,6 +3,7 @@
# @RPMVENDORDIR@/rpmrc
# Getting default rpm configuration
+include: @RPMLIBDIR@/rpmrc
#############################################################
# Values for RPM_OPT_FLAGS for various platforms