Index: CHANGES =================================================================== RCS file: /cvsroot/curl/CHANGES,v retrieving revision 1.66 diff -c -r1.66 CHANGES *** CHANGES 2001/01/05 10:11:41 1.66 --- CHANGES 2001/01/07 16:59:59 *************** *** 6,11 **** --- 6,17 ---- History of Changes + Loic Dachary (6 January 2001) + - Automated generation of rpm packages, no need to be root. + + - make distcheck generates a proper distribution (EXTRA_DIST + in all Makefile.am modified to match FILES). + Daniel (5 January 2001) - The krb4 support was broken in the release. Fixed now. Index: Makefile.am =================================================================== RCS file: /cvsroot/curl/Makefile.am,v retrieving revision 1.7 diff -c -r1.7 Makefile.am *** Makefile.am 2000/11/17 15:30:01 1.7 --- Makefile.am 2001/01/07 16:59:59 *************** *** 4,12 **** AUTOMAKE_OPTIONS = foreign no-dependencies ! EXTRA_DIST = curl.spec curl-ssl.spec SUBDIRS = docs lib src include tests test: @(cd tests; make quiet-test) --- 4,39 ---- AUTOMAKE_OPTIONS = foreign no-dependencies ! EXTRA_DIST = curl.spec curl-ssl.spec \ ! CHANGES FILES LEGAL MITX.txt MPL-1.1.txt \ ! config-win32.h reconf SUBDIRS = docs lib src include tests test: @(cd tests; make quiet-test) + + # + # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros + # must contain the following line: + # %_topdir /home/loic/local/rpm + # and that /home/loic/local/rpm contains the directory SOURCES, BUILD etc. + # + # If additional configure flags are needed to build the package, add the + # following in ~/.rpmmacros + # %configure CFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{_prefix} ${AM_CONFIGFLAGS} + # and run make rpm in the following way: + # AM_CONFIGFLAGS='--with-uri=/home/users/loic/local/RedHat-6.2' make rpm + # + + rpms: + $(MAKE) RPMDIST=curl rpm + $(MAKE) RPMDIST=curl-ssl rpm + + rpm: + RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \ + cp $(srcdir)/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \ + cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \ + rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \ + mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \ + mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm . Index: configure.in =================================================================== RCS file: /cvsroot/curl/configure.in,v retrieving revision 1.43 diff -c -r1.43 configure.in *** configure.in 2001/01/04 10:28:47 1.43 --- configure.in 2001/01/07 16:59:59 *************** *** 613,619 **** include/curl/Makefile \ src/Makefile \ lib/Makefile \ ! tests/Makefile) dnl perl/checklinks.pl \ dnl perl/getlinks.pl \ dnl perl/formfind.pl \ --- 613,621 ---- include/curl/Makefile \ src/Makefile \ lib/Makefile \ ! tests/Makefile \ ! curl.spec \ ! curl-ssl.spec) dnl perl/checklinks.pl \ dnl perl/getlinks.pl \ dnl perl/formfind.pl \ Index: docs/Makefile.am =================================================================== RCS file: /cvsroot/curl/docs/Makefile.am,v retrieving revision 1.2 diff -c -r1.2 Makefile.am *** docs/Makefile.am 2000/10/02 06:49:51 1.2 --- docs/Makefile.am 2001/01/07 17:00:00 *************** *** 18,22 **** curl_slist_free_all.3 \ curl_version.3 ! EXTRA_DIST = $(man_MANS) --- 18,25 ---- curl_slist_free_all.3 \ curl_version.3 ! EXTRA_DIST = $(man_MANS) \ ! MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS \ ! LIBCURL README.win32 RESOURCES TODO TheArtOfHttpScripting \ ! examples/README examples/*.c Index: lib/Makefile.am =================================================================== RCS file: /cvsroot/curl/lib/Makefile.am,v retrieving revision 1.13 diff -c -r1.13 Makefile.am *** lib/Makefile.am 2000/11/30 22:22:08 1.13 --- lib/Makefile.am 2001/01/07 17:00:00 *************** *** 4,9 **** --- 4,13 ---- AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = getdate.y \ + Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \ + libcurl.def + lib_LTLIBRARIES = libcurl.la # Some flags needed when trying to cause warnings ;-) *************** *** 55,60 **** --- 59,66 ---- escape.h getpass.c netrc.c telnet.h \ getinfo.c highlevel.c strequal.c strequal.h easy.c \ security.h security.c krb4.c memdebug.c memdebug.h + + noinst_HEADERS = setup.h highlevel.h # Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule. $(srcdir)/getdate.c: getdate.y Index: lib/ftp.c =================================================================== RCS file: /cvsroot/curl/lib/ftp.c,v retrieving revision 1.41 diff -c -r1.41 ftp.c *** lib/ftp.c 2001/01/05 10:11:42 1.41 --- lib/ftp.c 2001/01/07 17:00:01 *************** *** 26,31 **** --- 26,32 ---- #include #include #include + #include #include #include Index: src/Makefile.am =================================================================== RCS file: /cvsroot/curl/src/Makefile.am,v retrieving revision 1.10 diff -c -r1.10 Makefile.am *** src/Makefile.am 2000/11/30 08:08:49 1.10 --- src/Makefile.am 2001/01/07 17:00:01 *************** *** 10,26 **** bin_PROGRAMS = curl #memtest #memtest_SOURCES = memtest.c #memtest_LDADD = $(top_srcdir)/lib/libcurl.la curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c ! curl_LDADD = $(top_srcdir)/lib/libcurl.la ! curl_DEPENDENCIES = $(top_srcdir)/lib/libcurl.la BUILT_SOURCES = hugehelp.c CLEANFILES = hugehelp.c NROFF=@NROFF@ ! EXTRA_DIST = mkhelp.pl Makefile.vc6 AUTOMAKE_OPTIONS = foreign no-dependencies --- 10,33 ---- bin_PROGRAMS = curl #memtest + noinst_HEADERS = setup.h \ + config-win32.h \ + urlglob.h \ + version.h \ + writeout.h + #memtest_SOURCES = memtest.c #memtest_LDADD = $(top_srcdir)/lib/libcurl.la curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c ! curl_LDADD = ../lib/libcurl.la ! curl_DEPENDENCIES = ../lib/libcurl.la BUILT_SOURCES = hugehelp.c CLEANFILES = hugehelp.c NROFF=@NROFF@ ! EXTRA_DIST = mkhelp.pl config-win32.h \ ! Makefile.vc6 Makefile.b32 Makefile.m32 AUTOMAKE_OPTIONS = foreign no-dependencies Index: tests/Makefile.am =================================================================== RCS file: /cvsroot/curl/tests/Makefile.am,v retrieving revision 1.8 diff -c -r1.8 Makefile.am *** tests/Makefile.am 2000/12/05 09:15:44 1.8 --- tests/Makefile.am 2001/01/07 17:00:02 *************** *** 1,3 **** --- 1,4 ---- + EXTRA_DIST = data/*.txt ftpserver.pl httpserver.pl runtests.pl all: install: Index: curl.spec.in =================================================================== *** /dev/null Tue May 5 22:32:27 1998 --- curl.spec.in Sun Jan 7 12:47:07 2001 *************** *** 0 **** --- 1,84 ---- + %define name curl + %define version @VERSION@ + %define release 1 + %define prefix /usr + + %define builddir $RPM_BUILD_DIR/%{name}-%{version} + + Summary: get a file from a FTP, GOPHER or HTTP server. + Name: %{name} + Version: %{version} + Release: %{release} + Copyright: MPL + Vendor: Daniel Stenberg + Packager: Loic Dachary + Group: Utilities/Console + Source: %{name}-%{version}.tar.gz + URL: http://curl.haxx.se/ + BuildRoot: /tmp/%{name}-%{version}-root + + %description + curl is a client to get documents/files from servers, using any of the + supported protocols. The command is designed to work without user + interaction or any kind of interactivity. + + curl offers a busload of useful tricks like proxy support, user + authentication, ftp upload, HTTP post, file transfer resume and more. + + Note: this version is compiled without SSL (https:) support. + + %package devel + Summary: The includes, libs, and man pages to develop with libcurl + Group: Development/Libraries + + %description devel + libcurl is the core engine of curl; this packages contains all the libs, + headers, and manual pages to develop applications using libcurl. + + %prep + rm -rf %{builddir} + + %setup + + %build + %configure --without-ssl --prefix=%{prefix} + make + + %install + rm -rf $RPM_BUILD_ROOT + make DESTDIR=$RPM_BUILD_ROOT install-strip + + %clean + rm -rf $RPM_BUILD_ROOT + rm -rf %{builddir} + + %post + /sbin/ldconfig + + %postun + /sbin/ldconfig + + %files + %defattr(-,root,root) + %attr(0755,root,root) %{_bindir}/curl + %attr(0644,root,root) %{_mandir}/man1/* + %{prefix}/lib/libcurl.so* + %doc CHANGES FILES LEGAL MITX.txt MPL-1.1.txt README docs/BUGS + %doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/INSTALL docs/INTERNALS + %doc docs/LIBCURL docs/MANUAL docs/README* docs/RESOURCES docs/TODO + %doc docs/TheArtOfHttpScripting + + %files devel + %defattr(-,root,root) + %attr(0644,root,root) %{_mandir}/man3/* + %attr(0644,root,root) %{_includedir}/curl/* + %{prefix}/lib/libcurl.a + %{prefix}/lib/libcurl.la + %doc docs/examples/* + + %changelog + * Sun Jan 7 2001 Loic Dachary + + - use _mandir instead of prefix to locate man pages because + _mandir is not always prefix/man/man?. + Index: curl-ssl.spec.in =================================================================== *** /dev/null Tue May 5 22:32:27 1998 --- curl-ssl.spec.in Sun Jan 7 17:36:10 2001 *************** *** 0 **** --- 1,78 ---- + %define name curl-ssl + %define tarball curl + %define version @VERSION@ + %define release 1 + %define prefix /usr + + %define builddir $RPM_BUILD_DIR/%{tarball}-%{version} + + Summary: get a file from a FTP, GOPHER or HTTP server. + Name: %{name} + Version: %{version} + Release: %{release} + Copyright: MPL + Vendor: Daniel Stenberg + Packager: Loic Dachary + Group: Utilities/Console + Source: %{tarball}-%{version}.tar.gz + URL: http://curl.haxx.se/ + BuildRoot: /tmp/%{tarball}-%{version}-root + Requires: openssl >= 0.9.5 + + %description + curl is a client to get documents/files from servers, using any of the + supported protocols. The command is designed to work without user + interaction or any kind of interactivity. + + curl offers a busload of useful tricks like proxy support, user + authentication, ftp upload, HTTP post, file transfer resume and more. + + %package devel + Summary: The includes, libs, and man pages to develop with libcurl + Group: Development/Libraries + Requires: openssl-devel >= 0.9.5 + + %description devel + libcurl is the core engine of curl; this packages contains all the libs, + headers, and manual pages to develop applications using libcurl. + + %prep + rm -rf %{builddir} + + %setup -n %{tarball}-%{version} + + %build + %configure --prefix=%{prefix} --with-ssl + make + + %install + rm -rf $RPM_BUILD_ROOT + make DESTDIR=$RPM_BUILD_ROOT install-strip + + %clean + rm -rf $RPM_BUILD_ROOT + rm -rf %{builddir} + + %post + /sbin/ldconfig + + %postun + /sbin/ldconfig + + %files + %defattr(-,root,root) + %attr(0755,root,root) %{_bindir}/curl + %attr(0644,root,root) %{_mandir}/man1/* + %{_libdir}/libcurl.so* + %doc CHANGES FILES LEGAL MITX.txt MPL-1.1.txt README docs/BUGS + %doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/INSTALL docs/INTERNALS + %doc docs/LIBCURL docs/MANUAL docs/README* docs/RESOURCES docs/TODO + %doc docs/TheArtOfHttpScripting + + %files devel + %defattr(-,root,root) + %attr(0644,root,root) %{_mandir}/man3/* + %attr(0644,root,root) %{_includedir}/curl/* + %{_libdir}/libcurl.a + %{_libdir}/libcurl.la + %doc docs/examples/*