new version

f41
David Tardon 13 years ago
parent d1f4f59078
commit 34baf29c07

1
.gitignore vendored

@ -1 +1,2 @@
/libmspub-0.0.0.tar.xz /libmspub-0.0.0.tar.xz
/libmspub-0.0.1.tar.xz

@ -1,110 +0,0 @@
From 0b30f5542a2dee7d73c546617a5ea612e17816b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Thu, 7 Jun 2012 09:54:29 +0200
Subject: [PATCH] Oops, wrong license headers
---
src/conv/raw/pub2raw.cpp | 34 +++++++++++++++++++++-------------
src/lib/MSPUBDocument.cpp | 35 +++++++++++++++++++++--------------
2 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/src/conv/raw/pub2raw.cpp b/src/conv/raw/pub2raw.cpp
index 2a3a455..22cab3d 100644
--- a/src/conv/raw/pub2raw.cpp
+++ b/src/conv/raw/pub2raw.cpp
@@ -1,23 +1,31 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* libmspub
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2005-2012 Fridrich Strba <fridrich.strba@bluewin.ch>
* Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
- * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
* Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * All Rights Reserved.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * For minor contributions see the git repository.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02111-1301 USA
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
*/
#include <stdio.h>
diff --git a/src/lib/MSPUBDocument.cpp b/src/lib/MSPUBDocument.cpp
index 17d6d58..2c59987 100644
--- a/src/lib/MSPUBDocument.cpp
+++ b/src/lib/MSPUBDocument.cpp
@@ -1,22 +1,29 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* libmspub
- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
- * Copyright (C) 2007 Fridrich Strba (fridrich.strba@bluewin.ch)
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02111-1301 USA
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba <fridrich.strba@bluewin.ch>
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
*/
#include <sstream>
--
1.7.7

@ -1,5 +1,5 @@
Name: libmspub Name: libmspub
Version: 0.0.0 Version: 0.0.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: A library providing ability to interpret and import Microsoft Publisher files Summary: A library providing ability to interpret and import Microsoft Publisher files
@ -7,7 +7,6 @@ Group: System Environment/Libraries
License: GPLv2+ or LGPLv2+ or MPLv1.1 License: GPLv2+ or LGPLv2+ or MPLv1.1
URL: http://www.freedesktop.org/wiki/Software/libmspub URL: http://www.freedesktop.org/wiki/Software/libmspub
Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.xz Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.xz
Patch0: 0001-Oops-wrong-license-headers.patch
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: doxygen BuildRequires: doxygen
@ -50,7 +49,6 @@ Currently supported: XHTML, raw.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .Oops-wrong-license-headers.patch
%build %build
@ -96,5 +94,8 @@ rm -f %{buildroot}/%{_libdir}/*.la
%changelog %changelog
* Thu Jul 12 2012 David Tardon <dtardon@redhat.com> 0.0.1-1
- new release
* Thu Jun 07 2012 David Tardon <dtardon@redhat.com> 0.0.0-1 * Thu Jun 07 2012 David Tardon <dtardon@redhat.com> 0.0.0-1
- initial import - initial import

@ -1 +1 @@
03b483031d5e3134552298e79e322f25 libmspub-0.0.0.tar.xz a0a2172232c4c7fb4b23fde5e98d4f61 libmspub-0.0.1.tar.xz

Loading…
Cancel
Save