From bae586e50e27d19c478a5b3093680b33898e3231 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Feb 08 2016 09:08:37 +0000 Subject: update FSF addresss in the license file to silence rpmlint --- diff --git a/libtrash-3.3-license.patch b/libtrash-3.3-license.patch new file mode 100644 index 0000000..9a07e6b --- /dev/null +++ b/libtrash-3.3-license.patch @@ -0,0 +1,128 @@ +From 14d11656fe28646706911b19ca7a738e3e07c182 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Fri, 5 Feb 2016 11:58:12 +0100 +Subject: [PATCH] libtrash: update COPYING to match the current GPL 2.0 text + +Namely the postal address has changed. I have downloaded the current +version from: + +http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt +--- + COPYING | 39 +++++++++++++++++++-------------------- + 1 file changed, 19 insertions(+), 20 deletions(-) + +diff --git a/COPYING b/COPYING +index 5b6e7c6..d159169 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,12 +1,12 @@ +- GNU GENERAL PUBLIC LICENSE +- Version 2, June 1991 ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +- Preamble ++ Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by +-the GNU Library General Public License instead.) You can apply it to ++the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not +@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. +- +- GNU GENERAL PUBLIC LICENSE ++ ++ GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +- ++ + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in +@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. +- ++ + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is +@@ -225,7 +225,7 @@ impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. +- ++ + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License +@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + +- END OF TERMS AND CONDITIONS +- +- How to Apply These Terms to Your New Programs ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it +@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Also add information on how to contact you by electronic and paper mail. + +@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the +-library. If this is what you want to do, use the GNU Library General ++library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. +-- +2.5.0 + diff --git a/libtrash.spec b/libtrash.spec index a24d71d..6a19262 100644 --- a/libtrash.spec +++ b/libtrash.spec @@ -1,13 +1,14 @@ Summary: Libraries to move files to a trash-folder on delete Name: libtrash Version: 3.3 -Release: 4%{dist} +Release: 5%{dist} Group: System Environment/Libraries License: GPLv2+ URL: http://pages.stern.nyu.edu/~marriaga/software/libtrash Source: http://pages.stern.nyu.edu/~marriaga/software/libtrash/%{name}-%{version}.tgz Patch0: libtrash-3.2-defaults.patch Patch1: libtrash-3.2-makefile.patch +Patch2: libtrash-3.3-license.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl, python @@ -32,6 +33,7 @@ implements a trash can under GNU/Linux. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # -D_REENTRANT: keep up to date with src/Makefile @@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %doc README TODO COPYING CHANGE.LOG config.txt %changelog +* Mon Feb 08 2016 Kamil Dudka - 3.3-5 +- update FSF addresss in the license file to silence rpmlint + * Thu Feb 04 2016 Fedora Release Engineering - 3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild