[vdr-streamdev] own the configuration dir add patch to fix the GPL in COPYING and the FSF address in some source fil
Felix Kaechele
heffer at fedoraproject.org
Sun Oct 23 19:38:24 UTC 2011
commit 061037bad62387f87d34c7687854302fca0d59ef
Author: Felix Kaechele <heffer at fedoraproject.org>
Date: Sun Oct 23 21:38:10 2011 +0200
own the configuration dir
add patch to fix the GPL in COPYING and the FSF address in some source files
vdr-streamdev-gpl-fsf-fix.patch | 183 +++++++++++++++++++++++++++++++++++++++
vdr-streamdev.spec | 9 ++-
2 files changed, 191 insertions(+), 1 deletions(-)
---
diff --git a/vdr-streamdev-gpl-fsf-fix.patch b/vdr-streamdev-gpl-fsf-fix.patch
new file mode 100644
index 0000000..54888aa
--- /dev/null
+++ b/vdr-streamdev-gpl-fsf-fix.patch
@@ -0,0 +1,183 @@
+diff -ruN streamdev-0.5.1.orig/COPYING streamdev-0.5.1/COPYING
+--- streamdev-0.5.1.orig/COPYING 2008-04-01 16:29:55.000000000 +0200
++++ streamdev-0.5.1/COPYING 2010-03-24 00:34:05.000000000 +0100
+@@ -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 @@
+ 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 @@
+
+ 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 @@
+ 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 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 @@
+
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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.
+diff -ruN streamdev-0.5.1.orig/libdvbmpeg/ctools.c streamdev-0.5.1/libdvbmpeg/ctools.c
+--- streamdev-0.5.1.orig/libdvbmpeg/ctools.c 2008-04-01 16:29:56.000000000 +0200
++++ streamdev-0.5.1/libdvbmpeg/ctools.c 2011-10-23 21:32:27.158208794 +0200
+@@ -19,7 +19,7 @@
+
+ * 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.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *
+
+diff -ruN streamdev-0.5.1.orig/libdvbmpeg/ctools.h streamdev-0.5.1/libdvbmpeg/ctools.h
+--- streamdev-0.5.1.orig/libdvbmpeg/ctools.h 2008-04-01 16:29:56.000000000 +0200
++++ streamdev-0.5.1/libdvbmpeg/ctools.h 2011-10-23 21:32:27.160208800 +0200
+@@ -19,7 +19,7 @@
+
+ * 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.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *
+
+diff -ruN streamdev-0.5.1.orig/libdvbmpeg/remux.c streamdev-0.5.1/libdvbmpeg/remux.c
+--- streamdev-0.5.1.orig/libdvbmpeg/remux.c 2008-04-01 16:29:56.000000000 +0200
++++ streamdev-0.5.1/libdvbmpeg/remux.c 2011-10-23 21:32:27.165208817 +0200
+@@ -19,7 +19,7 @@
+
+ * 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.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *
+
+diff -ruN streamdev-0.5.1.orig/libdvbmpeg/remux.h streamdev-0.5.1/libdvbmpeg/remux.h
+--- streamdev-0.5.1.orig/libdvbmpeg/remux.h 2008-04-01 16:29:56.000000000 +0200
++++ streamdev-0.5.1/libdvbmpeg/remux.h 2011-10-23 21:32:27.166208821 +0200
+@@ -20,7 +20,7 @@
+
+ * 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.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *
+
+diff -ruN streamdev-0.5.1.orig/libdvbmpeg/transform.c streamdev-0.5.1/libdvbmpeg/transform.c
+--- streamdev-0.5.1.orig/libdvbmpeg/transform.c 2008-04-01 16:29:56.000000000 +0200
++++ streamdev-0.5.1/libdvbmpeg/transform.c 2011-10-23 21:32:27.178208860 +0200
+@@ -19,7 +19,7 @@
+
+ * 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.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *
+
+diff -ruN streamdev-0.5.1.orig/libdvbmpeg/transform.h streamdev-0.5.1/libdvbmpeg/transform.h
+--- streamdev-0.5.1.orig/libdvbmpeg/transform.h 2009-06-12 15:16:14.000000000 +0200
++++ streamdev-0.5.1/libdvbmpeg/transform.h 2011-10-23 21:32:27.179208863 +0200
+@@ -19,7 +19,7 @@
+
+ * 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.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *
+
diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec
index 266e7a4..323d3e5 100644
--- a/vdr-streamdev.spec
+++ b/vdr-streamdev.spec
@@ -6,7 +6,7 @@
Name: vdr-%{pname}
Version: 0.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Streaming plug-in for VDR
Group: Applications/Multimedia
@@ -16,6 +16,7 @@ Source0: http://projects.vdr-developer.org/attachments/download/497/vdr-s
# Configuration files for plugin parameters. These are Fedora specific and not in upstream.
Source1: %{name}-server.conf
Source2: %{name}-client.conf
+Patch0: %{name}-gpl-fsf-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: vdr-devel >= 1.5.9
@@ -44,6 +45,7 @@ VDR will then be able to work even without a DVB device.
%prep
%setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}}
+%patch0 -p1
sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile
@@ -77,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT
%{plugindir}/libvdr-%{pname}-server.so.%{apiver}
%{_libdir}/vdr/bin/externremux.sh
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf
+%dir %{configdir}/plugins/streamdev-server
%config(noreplace) %{configdir}/plugins/streamdev-server/streamdevhosts.conf
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
@@ -87,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
%changelog
+* Sun Oct 23 2011 Felix Kaechele <heffer at fedoraproject.org> - 0.5.1-3
+- own the configuration dir
+- add patch to fix the GPL in COPYING and the FSF address in some source files
+
* Sat Oct 08 2011 Felix Kaechele <heffer at fedoraproject.org> - 0.5.1-2
- move streamdevhosts.conf to the right directory
More information about the scm-commits
mailing list