home:AndreasStieger:branches:openSUSE:Factory:Contrib/jigdo -> openSUSE:Factory:Contrib/jigdo https://build.opensuse.org/request/show/98239 Description: - reformat spec file - set license to GPL-2.0 - update upstream URL and author email address - split up jigdo.patch into logical parts changes files: -------------- --- jigdo.changes +++ jigdo.changes @@ -1,0 +2,11 @@ +Mon Dec 26 13:35:28 UTC 2011 - andreas.stieger@gmx.de + +- reformat spec file +- set license to GPL-2.0 +- update upstream URL and author email address +- split up jigdo.patch into logical parts: + * jigdo-0.7.3-makefile-do-not-strip.patch + * jigdo-0.7.3-makefile-paths.patch + * jigdo-0.7.3-add-includes.patch + +------------------------------------------------------------------- old: ---- jigdo.patch new: ---- jigdo-0.7.3-add-includes.patch jigdo-0.7.3-makefile-do-not-strip.patch jigdo-0.7.3-makefile-paths.patch spec files: ----------- --- jigdo.spec +++ jigdo.spec @@ -1,27 +1,36 @@ # -# spec file for package jigdo (Version 0.7.3) +# spec file for package jigdo # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -# usedforbuild aaa_base acl attr audit-libs autoconf automake bash binutils bzip2 coreutils cpio cpp cpp42 cracklib curl-ca-bundle cvs diffutils file filesystem fillup findutils gawk gcc gcc-c++ gcc42 gcc42-c++ gdbm gettext gettext-devel glibc glibc-devel glibc-locale grep groff gzip info insserv less libacl libattr libbz2-1 libbz2-devel libcurl-devel libcurl4 libdb-4_5 libdb-4_5-devel libgcc42 libgomp42 libidn libidn-devel libltdl-3 libmudflap42 libopenssl-devel libopenssl0_9_8 libreadline5 libstdc++42 libstdc++42-devel libtool libuuid1 libvolume_id libxcrypt libzio linux-kernel-headers m4 make man mktemp ncurses net-tools netcfg openssl-certs pam pam-modules patch perl perl-base permissions popt rpm sed sysvinit tar texinfo timezone util-linux wget zlib zlib-devel Name: jigdo -BuildRequires: gcc-c++ libbz2-devel zlib-devel libdb-4_5-devel -Url: http://atterer.net/jigdo/ -License: GPL v2 or later -Group: Productivity/Networking/Other -AutoReqProv: on +BuildRequires: gcc-c++ +BuildRequires: libbz2-devel +BuildRequires: libdb-4_5-devel +BuildRequires: zlib-devel +Url: http://atterer.org/jigdo/ Summary: Jigsaw Download +License: GPL-2.0 +Group: Productivity/Networking/Other Version: 0.7.3 -Release: 63 +Release: 0 Source: %{name}-%{version}.tar.bz2 -Patch: %{name}.patch +Patch1: jigdo-0.7.3-makefile-do-not-strip.patch +Patch2: jigdo-0.7.3-makefile-paths.patch +Patch3: jigdo-0.7.3-add-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: wget @@ -40,25 +49,29 @@ Authors: -------- - Richard Atterer + Richard Atterer %prep %setup -q -%patch +%patch1 +%patch2 +%patch3 %build -%configure --prefix=%{_prefix} \ +%configure \ + --prefix=%{_prefix} \ --infodir=%{_infodir} \ --mandir=%{_mandir} \ --with-gui=no -make + +%__make %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %find_lang %{name} %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root) @@ -67,37 +80,5 @@ %{_mandir}/*/* %{_datadir}/locale/*/*/* %{_datadir}/%{name} + %changelog -* Sat Feb 28 2009 - andreas.stieger@gmx.de -- added find_lang macro -- fix build on post-10.3 by adding header files to jigdo.patch -- added zlib-devel to BuildRequires -- added libdb-4_5-devel to BuildRequires -- removed curl-devel from BuildRequires -- removed db_devel from BuildRequires -- removed wget from BuildRequires -* Sat Mar 24 2007 - aj@suse.de -- Add libbz2-devel to BuildRequires. -* Mon Nov 06 2006 - cthiel@suse.de -- fix build (man pages don't need to be executable) -* Sun Oct 01 2006 - cthiel@suse.de -- update to version 0.7.3 - * A maintenance release with some bug fixes - * Fix for compilation on 64 bit architectures - * Fixes to make the code compile cleanly with GCC 4.1 -* Wed May 24 2006 - cthiel@suse.de -- remove GUI part of jigdo, as it's broken anyway -- removed irrelevant parts from jigdo-0.7.2.patch -* Sat May 13 2006 - cthiel@suse.de -- added wget to Requires -* Wed Jan 25 2006 - mls@suse.de -- converted neededforbuild to BuildRequires -* Sun Oct 30 2005 - cthiel@suse.de -- fix build with gcc 4.1 -* Tue Sep 13 2005 - cthiel@suse.de -- specfile cleanup -* Fri Sep 02 2005 - cthiel@suse.de -- install desktop file (#114918) -- don't strip symbols to fix -debuginfo package (#114918) -* Tue Aug 23 2005 - cthiel@suse.de -- initial package (version 0.7.2) other changes: -------------- ++++++ jigdo-0.7.3-add-includes.patch (new) --- jigdo-0.7.3-add-includes.patch +++ jigdo-0.7.3-add-includes.patch @@ -0,0 +1,84 @@ +Index: src/compat.hh +=================================================================== +--- src/compat.hh.orig 2005-07-02 18:21:35.000000000 +0100 ++++ src/compat.hh 2011-12-26 12:46:03.000000000 +0000 +@@ -18,6 +18,7 @@ + + #include + ++#include + #include <string> + #include + #include +Index: src/gtk/gtk-single-url.cc +=================================================================== +--- src/gtk/gtk-single-url.cc.orig 2005-10-15 22:27:39.000000000 +0100 ++++ src/gtk/gtk-single-url.cc 2011-12-26 12:46:03.000000000 +0000 +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #include + #include +Index: src/gtk/jigdo.cc +=================================================================== +--- src/gtk/jigdo.cc.orig 2005-07-09 23:21:04.000000000 +0100 ++++ src/gtk/jigdo.cc 2011-12-26 12:46:03.000000000 +0000 +@@ -19,6 +19,7 @@ + #include <iostream> + #include <string> + #include <vector> ++#include + + #include + #include +Index: src/recursedir.cc +=================================================================== +--- src/recursedir.cc.orig 2006-05-14 19:23:31.000000000 +0100 ++++ src/recursedir.cc 2011-12-26 12:46:03.000000000 +0000 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + //______________________________________________________________________ +Index: src/util/configfile.cc +=================================================================== +--- src/util/configfile.cc.orig 2003-09-27 22:31:04.000000000 +0100 ++++ src/util/configfile.cc 2011-12-26 12:46:03.000000000 +0000 +@@ -18,6 +18,7 @@ + + #include <iostream> + #include <fstream> ++#include + + #include + #include +Index: src/util/md5sum.hh +=================================================================== +--- src/util/md5sum.hh.orig 2005-04-10 00:09:52.000000000 +0100 ++++ src/util/md5sum.hh 2011-12-26 12:46:03.000000000 +0000 +@@ -31,6 +31,7 @@ + #include <cstdlib> + #include <iosfwd> + #include <string> ++#include + + #include + #include +Index: src/util/string-utf.cc +=================================================================== +--- src/util/string-utf.cc.orig 2004-09-12 00:26:30.000000000 +0100 ++++ src/util/string-utf.cc 2011-12-26 12:46:03.000000000 +0000 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #include + #include ++++++ jigdo-0.7.3-makefile-do-not-strip.patch (new) --- jigdo-0.7.3-makefile-do-not-strip.patch +++ jigdo-0.7.3-makefile-do-not-strip.patch @@ -0,0 +1,13 @@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2006-05-19 15:55:41.000000000 +0100 ++++ Makefile.in 2011-12-26 12:45:43.000000000 +0000 +@@ -15,7 +15,7 @@ datadir = @datadir@ + + PACKAGE = jigdo + INSTALL = @INSTALL@ +-INSTALL_EXE = @INSTALL@ -s ++INSTALL_EXE = @INSTALL@ + INSTALL_DATA = @INSTALL@ -m 644 + INSTALL_SCRIPT = @INSTALL@ -m 755 + AWK = @AWK@ ++++++ jigdo-0.7.3-makefile-paths.patch (new) --- jigdo-0.7.3-makefile-paths.patch +++ jigdo-0.7.3-makefile-paths.patch @@ -0,0 +1,31 @@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2011-12-26 12:45:43.000000000 +0000 ++++ Makefile.in 2011-12-26 12:46:00.000000000 +0000 +@@ -75,7 +75,7 @@ install-jigdo-file: + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 + x="doc/jigdo-file.1"; \ + test -f "$$x" || x="$(srcdir)/$$x"; \ +- $(INSTALL) "$$x" $(DESTDIR)$(mandir)/man1 ++ $(INSTALL_DATA) "$$x" $(DESTDIR)$(mandir)/man1 + install-jigdo-lite: + $(INSTALL) -d "$(DESTDIR)$(bindir)" + $(INSTALL) -d "$(DESTDIR)$(datadir)/jigdo" +@@ -89,7 +89,7 @@ install-jigdo-lite: + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 + x="doc/jigdo-lite.1"; \ + test -f "$$x" || x="$(srcdir)/$$x"; \ +- $(INSTALL) "$$x" $(DESTDIR)$(mandir)/man1 ++ $(INSTALL_DATA) "$$x" $(DESTDIR)$(mandir)/man1 + install-jigdo-mirror: + $(INSTALL) -d "$(DESTDIR)$(bindir)" + $(INSTALL_SCRIPT) "$(srcdir)/scripts/jigdo-mirror" \ +@@ -97,7 +97,7 @@ install-jigdo-mirror: + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 + x="doc/jigdo-mirror.1"; \ + test -f "$$x" || x="$(srcdir)/$$x"; \ +- $(INSTALL) "$$x" $(DESTDIR)$(mandir)/man1 ++ $(INSTALL_DATA) "$$x" $(DESTDIR)$(mandir)/man1 + install-jigdo: + $(INSTALL) -d "$(DESTDIR)$(bindir)" + $(INSTALL_EXE) src/jigdo "$(DESTDIR)$(bindir)" ++++++ deleted files: --- jigdo.patch To REVIEW against the previous version: osc request show --diff 98239 To ACCEPT the request: osc request accept 98239 --message="reviewed ok." To DECLINE the request: osc request decline 98239 --message="declined for reason xyz (see ... for background / policy / ...)." To REVOKE the request: osc request revoke 98239 --message="retracted because ..., sorry / thx / see better version ..." -- Hermes messaging (http://hermes.opensuse.org) openSUSE Build Service (https://build.opensuse.org/) Collaboration: http://en.opensuse.org/Build_Service/Collaboration -- To unsubscribe, e-mail: opensuse-contrib+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-contrib+owner@opensuse.org