forked from pool/bwbar
Accepting request 74845 from home:AndreasStieger:branches:network:utilities
- fix SLES_9 build - fix for missing licenses package in Factory - fix rpmlint warning about LGPL address - fix rpmlint warning about GPL address - fix rpmlint warning about rpm macros in comments - fix osc commit warning of unreferenced signature files OBS-URL: https://build.opensuse.org/request/show/74845 OBS-URL: https://build.opensuse.org/package/show/network:utilities/bwbar?expand=0&rev=2
This commit is contained in:
parent
75458e2c99
commit
c7abdcff82
43
COPYING
43
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
|
||||
@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) 19yy <name of author>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -303,17 +303,16 @@ 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.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) 19yy name of author
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
@ -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.
|
||||
|
@ -1,8 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.5 (GNU/Linux)
|
||||
Comment: See http://www.kernel.org/signature.html for info
|
||||
|
||||
iD8DBQBE8HpUyGugalF9Dw4RAjdkAJ4ipAoiMhPvjiRLpy9TM6hes6ctYgCdHZDR
|
||||
F19bPoymgi80OUL+K5Sr6yA=
|
||||
=F7W0
|
||||
-----END PGP SIGNATURE-----
|
@ -1,6 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 29 20:40:55 UTC 2011 - andreas.stieger@gmx.de
|
||||
|
||||
- fix SLES_9 build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 29 19:18:35 UTC 2011 - andreas.stieger@gmx.de
|
||||
|
||||
- fix for missing licenses package in Factory
|
||||
- fix rpmlint warning about LGPL address
|
||||
- fix rpmlint warning about GPL address
|
||||
- fix rpmlint warning about rpm macros in comments
|
||||
- fix osc commit warning of unreferenced signature files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 25 14:05:10 GMT 2009 andreas.stieger@gmx.de
|
||||
|
||||
- initial package
|
||||
- runlevel script and config file
|
||||
_ added GPLv2 text
|
||||
- added GPLv2 text
|
||||
|
23
bwbar.spec
23
bwbar.spec
@ -11,7 +11,7 @@
|
||||
# norootforbuild
|
||||
|
||||
Name: bwbar
|
||||
BuildRequires: gcc-c++ libpng-devel licenses
|
||||
BuildRequires: gcc-c++ libpng-devel
|
||||
Url: http://www.kernel.org/pub/software/web/bwbar/
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Networking/Other
|
||||
@ -23,9 +23,7 @@ Source: %{name}-%{version}.tar.bz2
|
||||
Source1: COPYING
|
||||
Source2: bwbar_config
|
||||
Source3: bwbar_initscript
|
||||
#Patch: %{name}.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: licenses
|
||||
|
||||
%description
|
||||
bwbar is a small program that generates a text and a graphical readout
|
||||
@ -39,7 +37,8 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#%patch
|
||||
|
||||
%{__cp} %{SOURCE1} .
|
||||
|
||||
%build
|
||||
CFLAGS="-Wall $RPM_OPT_FLAGS"
|
||||
@ -47,12 +46,12 @@ CFLAGS="-Wall $RPM_OPT_FLAGS"
|
||||
--infodir=%{_infodir} \
|
||||
--mandir=%{_mandir}
|
||||
make
|
||||
|
||||
%install
|
||||
ln -vs /usr/share/doc/licenses/GPL-2.0.txt COPYING
|
||||
install -d $RPM_BUILD_ROOT%{_bindir}
|
||||
install -m 755 --strip bwbar $RPM_BUILD_ROOT%{_bindir}
|
||||
install -m 644 -D -T %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||
install -m 755 -D -T %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
|
||||
install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||
install -m 755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
|
||||
ln -svf ../../etc/init.d/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
|
||||
|
||||
@ -61,6 +60,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%postun
|
||||
%insserv_cleanup
|
||||
%restart_on_update
|
||||
|
||||
%preun
|
||||
%stop_on_removal
|
||||
@ -72,14 +72,5 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_sbindir}/*
|
||||
%config %{_sysconfdir}/%{name}
|
||||
%config %{_sysconfdir}/init.d/%{name}
|
||||
#%{_mandir}/*/*
|
||||
#%{_datadir}/locale/*/*/*
|
||||
#%{_datadir}/%{name}
|
||||
%changelog
|
||||
-------------------------------------------------------------------
|
||||
* Wed Mar 25 2009 andreas.stieger@gmx.de
|
||||
|
||||
- initial package
|
||||
- runlevel script and config file
|
||||
- added GPLv2 text
|
||||
|
||||
|
@ -18,8 +18,7 @@
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; 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
|
||||
#
|
||||
# /etc/init.d/bwbar
|
||||
# and its symbolic link
|
||||
|
Loading…
x
Reference in New Issue
Block a user