From 56a1638d48c51265729be706d0e6e9a5131ea284 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Apr 03 2013 13:21:32 +0000 Subject: Update to latest upstream release: 5.21p - arc was once shareware relicensed to the GPL with permission of its original author, update the docs to reflect this (rhbz#947786) --- diff --git a/.gitignore b/.gitignore index e42e380..f0bea49 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ arc-5.21o.tgz +/arc-5.21p.tar.gz diff --git a/arc-5.21p-clarify-license.patch b/arc-5.21p-clarify-license.patch new file mode 100644 index 0000000..a62ab9e --- /dev/null +++ b/arc-5.21p-clarify-license.patch @@ -0,0 +1,502 @@ +diff -up arc-5.21p/Arc521.doc~ arc-5.21p/Arc521.doc +--- arc-5.21p/Arc521.doc~ 2010-08-07 15:06:42.000000000 +0200 ++++ arc-5.21p/Arc521.doc 2013-04-03 15:07:43.759714829 +0200 +@@ -60,7 +60,8 @@ Associates, Inc. in October of 1986. + Section Page + + +-Introduction .................................... 1 ++License ......................................... 1 ++Introduction .................................... 2 + Using ARC ....................................... 3 + ARC commands .................................... 5 + Adding files ................................ 5 +@@ -81,7 +82,6 @@ MARC .................................. + ARCE ............................................ 20 + Version numbers ................................. 21 + Common questions and answers .................... 22 +-Maintenance contracts ........................... 24 + Revision history ................................ 25 + Changes in version 3 ........................ 25 + Changes in version 4 ........................ 25 +@@ -94,7 +94,6 @@ Revision history ...................... + Changes in version 5.2 ...................... 30 + Program history and credits ..................... 31 + Bulletin boards ................................. 33 +-Site licenses ................................... 34 + + + +@@ -108,80 +107,65 @@ Site licenses ......................... + + + +- INTRODUCTION ++ ++ LICENSE ++ ++ ++ ++ARC is Free Software distributed under the terms of the GNU General Public ++License (See COPYING for license details). ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +-ARC is the copyrighted property of System Enhancement +-Associates, Inc. You are granted a limited license to +-use ARC, and to copy it and distribute it, provided +-that the following conditions are met: +- +-1) No fee may be charged for such copying and +- distribution. +- +-2) ARC may ONLY be distributed in its original, +- unmodified state. +- +-3) ARC may *not* be distributed, in whole or in part, as +- part of any commercial product or service without +- the express written permission of System +- Enhancement Associates. +- +- +-Contributions for the use of this program will be +-appreciated, and should be sent to: +- +- System Enhancement Associates, Inc. +- 21 New Street, Wayne NJ 07470 +- +-You may not use this product in a commercial +-environment or a governmental organization without +-paying a license fee of $35. Site licenses and +-commercial distribution licenses are available. A +-program disk and printed documentation are available +-for $50. See the order form enclosed with this manual +-for more details. + + + +-ARC is user supported software. This means that you +-may copy it freely and give the copies away to anyone +-you wish, at no cost. They are in turn requested to +-send in a contribution if they decide to use it. +- +-The user supported software concept (often referred to +-as "shareware") is an attempt to provide software at low +-cost. The cost of offering a new product by +-conventional means is staggering, and hence dissuades +-many independent authors and small companies from +-developing and promoting their ideas. User supported +-software is an attempt to develop a new marketing +-channel, where products can be introduced at low cost. + + + + +-ARC Page 1 +- If user supported software works, then everyone will +-benefit. The user will benefit by receiving quality +-products at low cost, and by being able to "test +-drive" software thoroughly before purchasing it. The +-author benefits by being able to enter the commercial +-software arena without first needing large sources of +-venture capital. +- +-But it can only work with your support. We're not +-just talking about ARC here, but about all user +-supported software. If you obtain a user supported +-program from a friend or colleague, and are still +-using it after a couple of weeks, then it is obviously +-worth something to you, and a contribution should be +-sent. + + + +-And now, back to ARC: ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ARC Page 1 ++ INTRODUCTION ++ ++ + + ARC is used to create and maintain file archives. An + archive is a group of files collected together into +@@ -217,6 +201,22 @@ never be larger than the original file. + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + ARC Page 2 + USING ARC + +@@ -1196,14 +1196,14 @@ If you run ARCE with no arguments at all + give you a brief reminder of how to use it. + + +-NOTICE: NOTICE: ARCE is the copyrighted property of Vernon D. +- Buerg and Wayne Chin. It is included on the +- ARC program disk as a service to ARC users. +- +- Vernon D. Buerg +- 456 Lakeshire Drive +- Daly City, CA 94015 +- RBBS: (415) 994-2944 ++NOTICE: ARCE is not Free Software, and thus is not included with this version ++of ARC. ++ ++ ++ ++ ++ ++ + + + +@@ -1303,13 +1303,7 @@ A: ARC.EXE. One or more people have bee + worth the extra step in development in this case. + + +-Q: How can I get the latest version of ARC? + +-A: ARC updates are distributed through normal +- shareware channels, and by FidoNet. We also ship a +- program update disk on every order of $50 or more. +- Also, please refer to the next section for +- information about our maintenance contracts. + + + +@@ -1317,32 +1311,14 @@ A: ARC updates are distributed through n + + + +-ARC Page 22 +- Q: Can I use ARC to distribute my public domain or +- shareware program? + +-A: Yes, of course. + + +-Q: Can I use ARC to distribute my commercial software +- package? + +-A: Yes, provided that you obtain a commercial +- distribution license from us. Please contact us +- for details. +- +- +-Q: I'm a commercial user. Why should I pay for +- shareware that others get for free? +- +-A: Because you cannot credibly plead poverty. +- ___ Shareware, all shareware, is an attempt to develop +- a new marketing channel to the benefit of everyone. +- You can still "test drive" shareware for a short +- period, but if you decide to use it in your +- business, then you should pay for it. + + ++ARC Page 22 ++ + Q: Why not allow me to select which method of + compression I want ARC to use? + +@@ -1372,18 +1348,42 @@ A: It would needlessly complicate ARC, b + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + ARC Page 23 +- MAINTENANCE CONTRACTS ++ ++ ++ ++ ++ ++ ++ + + + +-Registered users of ARC receive 90 days of telephone +-support at no extra charge. If you wish, you can +-extend this by pruchasing a maintenance contract. + +-A maintenance contract costs $50 per year and entitles +-you to unlimited telephone support, as well as free +-updates to ARC as they come out. + + + +@@ -1923,178 +1923,3 @@ distribute ARC. + + + ARC Page 33 +- SITE LICENSES +- +- +- +-Corporate users may wish to obtain a site license for +-the use of ARC. Please use the order form in this +-manual to order a site license. Site licenses are +-granted as of when we receive your payment. License +-fees vary depending on the number of computers on +-which ARC will be used, as follows: +- +- 1 to 9 machines $35 each +- 10 to 24 machines $25 each +- 25 to 49 machines $20 each +- 50 to 99 machines $15 each +- over 99 machines $1500 one time fee +- +- +- +-Enclosed is a site license agreement, which should be +-signed and sent with your payment when ordering a +-commercial site license. +- +- +-A commercial site license does not include additional +-copies of the ARC program disk and the ARC manual. +-Instead, you make your own copies of the disk and +-manual as you need them. If you wish, you can order +-additional program disks and manuals from us. +- +-Additional program disks cost $10 each. Additional +-manuals cost $20 each. If you wish, you can order +-program sets for $40 each. A "program set" is a +-program disk and manual enclosed in a vinyl binder. +-There is a $50 minimum on all orders. +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-ARC Page 34 +- SITE LICENSE APPLICATION +- +- +- +-The use of ARC in a commercial environment or government organization +-is granted under the following terms: +- +-1. Payment of the license fee must be made to System Enhancement +- Associates, Inc. The fee is based on the number of computers +- which will be used to run ARC, as follows: +- +- 1 to 9 machines $35 each +- 10 to 24 machines $25 each +- 25 to 49 machines $20 each +- 50 to 99 machines $15 each +- over 99 machines $1500 one time fee +- +-2. You may use ARC on the number of computers included in the license +- fee. If you have paid the fee for over 99 machines, then you may +- use ARC on any number of computers within your organization. +- +-3. You may make copies of the program and documentation, in their +- original, unmodified form, without restriction. You may +- distribute these copies without restriction. +- +-4. If these copies are distributed outside of your organization, you +- have no obligation to control the use of those copies which are +- outside of your organization. +- +-5. You may make copies of the program documentation, in both its +- printed form and machine readable form, without restriction. +- +-6. You may use all future versions of ARC under this license. +- +-7. You may *not* modify the program or charge a fee for copying or +- distributing the program or its documentation. +- +-8. It is your responsibility to make the necessary copies and to +- deliver them to the computers which they will be used on. If you +- wish, you can order additional ARC program disks and manuals. +- +-9. We are not responsible for *anything* that may happen or not happen +- if you use ARC. You're on your own. +- +- +- I agree to abide by the terms and conditions of this license. +- +- _____________________________ __________________________ +- Signature Date +- +- _____________________________ +- Name (please print or type) +- +- _____________________________ +- Title +- +- _____________________________ +- Company +- +- +- ORDER FORM +- +- +- +-Check which items you wish to purchase: +- +- [] Noncommercial license for the use of ARC. +- +- [] Commercial license for the use of ARC on ___ computers (see +- attached price schedule and terms). +- +- [] Program disk and documentation (only on orders of $50 or more, +- not counting maintenance contracts). +- +- [] ____ additional program disks at $10 per disk. +- +- [] ____ additional manuals at $20 per manual +- +- [] ____ additional program sets (disk, manual, and binder) at $40 +- per program set. +- +- [] One year maintenance agreement at $50 per year. +- +- [] Payment of $_____ is enclosed (check or money order). +- +- [] Please charge $_____ to my [] Visa or [] MasterCard: +- +- Card number: _______________________________ +- +- Expiration date: ___________________________ +- +- Signature: _________________________________ +- +- _______________________________________________ +- Name +- +- _______________________________________________ +- +- +- _______________________________________________ +- Address +- +- ______________________ ________ ____________ +- City State Zip +- +- _______/_______ +- FidoNet address +- +- +-Send this completed form to: +- +- System Enhancement Associates, Inc. +- 21 New Street, Wayne NJ 07470 +- +-For program disk orders outside the U.S., please add an additional $5, +-and enclose an international money order payable in U.S. currency. +- +-For commercial site license orders, please enclose a signed copy of +-the site license agreement. +- +diff -up arc-5.21p/Readme~ arc-5.21p/Readme +--- arc-5.21p/Readme~ 2010-08-07 15:06:42.000000000 +0200 ++++ arc-5.21p/Readme 2013-04-03 14:45:24.840611200 +0200 +@@ -89,12 +89,12 @@ the programs behave indentically. Note t + ARC520.DOC - the differences between the two versions are described in + the file CHANGES.521. + +-Oh yeah - this program may be distributed freely so long as you don't +-modify it in any way. You may not charge for distributing it. (Don't +-feel bad, I can't charge for it either. }-) It'd be nice if you kept +-this and the other enclosed doc files with it when distributing, but +-I'm not going to make a fuss about it. Most people are so familiar +-with the program by now that it wouldn't matter much anyway. You ++Oh yeah - this program may be distributed freely under the terms of ++the GNU General Public License (See COPYING for license details). ++ ++It'd be nice if you kept this and the other enclosed doc files with it when ++distributing, but I'm not going to make a fuss about it. Most people are so ++familiar with the program by now that it wouldn't matter much anyway. You + should keep this README file around, so bug reports & such will find + their way back to me. (Bugs? What bugs? Nah, there aren't any bugs...) + diff --git a/arc-5.21p-manpage-section-fix.patch b/arc-5.21p-manpage-section-fix.patch new file mode 100644 index 0000000..7bf339a --- /dev/null +++ b/arc-5.21p-manpage-section-fix.patch @@ -0,0 +1,23 @@ +This patch changes the man page sections from 1L to 1. This is +also already changed upstream but not released yet. + +Index: arc-5.21p/arc.1 +=================================================================== +--- arc-5.21p.orig/arc.1 2011-01-01 13:37:54.000000000 +0000 ++++ arc-5.21p/arc.1 2011-01-01 13:38:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-.TH ARC 1L "11 Nov 1991" "Howard Chu@JPL" "LOCAL COMMANDS" ++.TH ARC 1 "11 Nov 1991" "Howard Chu@JPL" "LOCAL COMMANDS" + .SH NAME + arc \- pc archive utility + .SH SYNOPSIS +Index: arc-5.21p/marc.1 +=================================================================== +--- arc-5.21p.orig/marc.1 2011-01-01 13:37:57.000000000 +0000 ++++ arc-5.21p/marc.1 2011-01-01 13:38:07.000000000 +0000 +@@ -1,4 +1,4 @@ +-.TH MARC 1L "25 Nov 1992" "Howard Chu@JPL" "LOCAL COMMANDS" ++.TH MARC 1 "25 Nov 1992" "Howard Chu@JPL" "LOCAL COMMANDS" + .SH NAME + marc \- archive merger + .SH SYNOPSIS diff --git a/arc-5.21p-spelling.patch b/arc-5.21p-spelling.patch new file mode 100644 index 0000000..4af5646 --- /dev/null +++ b/arc-5.21p-spelling.patch @@ -0,0 +1,16 @@ +This patch fixes a spelling error in arc's man page. This error +is already fixed upstream but not released yet. + +Index: arc-5.21p/arc.1 +=================================================================== +--- arc-5.21p.orig/arc.1 2011-01-01 13:26:19.000000000 +0000 ++++ arc-5.21p/arc.1 2011-01-01 13:34:35.000000000 +0000 +@@ -137,7 +137,7 @@ + .I Arc + Version 2 differs from version 1 in that archive entries + are automatically compressed when they are added to the archive, +-making a separate compression step unecessary. The nature of the ++making a separate compression step unnecessary. The nature of the + compression is indicated by the header version number placed in + each archive entry, as follows: + .nf diff --git a/arc.spec b/arc.spec index fe6ed28..0c39e1d 100644 --- a/arc.spec +++ b/arc.spec @@ -1,12 +1,18 @@ Name: arc -Version: 5.21o -Release: 12%{?dist} +Version: 5.21p +Release: 1%{?dist} Summary: Arc archiver Group: Applications/Archiving License: GPL+ URL: http://arc.sourceforge.net/ -Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# 2 small polish patches courtesy of Debian +Patch0: arc-5.21p-spelling.patch +Patch1: arc-5.21p-manpage-section-fix.patch +# Arc was once shareware, but has been relicensed to the GPL with permission +# of its original author. But there still is some confusing license text in the +# docs this clarifies those parts of the text (rhbz#947786) +Patch2: arc-5.21p-clarify-license.patch %description Arc file archiver and compressor. Long since superseded by zip/unzip @@ -15,6 +21,9 @@ but useful if you have old .arc files you need to unpack. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 sed -i -e 's,^OPT =.*$,OPT = ${RPM_OPT_FLAGS},' Makefile @@ -23,24 +32,23 @@ make %{?_smp_mflags} %install -rm -fr %{buildroot} install -m 0755 -d %{buildroot}{%{_bindir},%{_mandir}/man1} install -m 0755 arc marc %{buildroot}%{_bindir} -install -m 0644 arc.1 %{buildroot}%{_mandir}/man1/ - - -%clean -rm -fr %{buildroot} +install -m 0644 arc.1 marc.1 %{buildroot}%{_mandir}/man1/ %files -%defattr(0644, root, root, 0755) %doc LICENSE COPYING PATCHLEVEL Readme Arc521.doc -%doc %{_mandir}/man1/* -%attr (0755,root,root) %{_bindir}/* +%{_bindir}/* +%{_mandir}/man1/* %changelog +* Wed Apr 3 2013 Hans de Goede 5.21p-1 +- Update to latest upstream release: 5.21p +- arc was once shareware relicensed to the GPL with permission of its original + author, update the docs to reflect this (rhbz#947786) + * Wed Feb 13 2013 Fedora Release Engineering - 5.21o-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 2595daf..6dcc506 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b30c739b42b2fe8ac4ec0a05f34f284 arc-5.21o.tgz +902ce24b23422880d474df6f1d9eba5e arc-5.21p.tar.gz