From 07c2d79164478767f6bdbe606a9f22b8c24606fe837628d6e99f4be94a93d5c9 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Sat, 20 Nov 2010 11:33:49 +0000 Subject: [PATCH] Accepting request 53398 from Base:System Accepted submit request 53398 from user mvyskocil OBS-URL: https://build.opensuse.org/request/show/53398 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/prctl?expand=0&rev=8 --- prctl-1.3.dif | 90 -------------------------- prctl-1.3.tar.gz | 3 - prctl-1.5-Makefile.patch | 82 +++++++++++++++++++++++ warn.patch => prctl-1.5-warnings.patch | 10 +-- prctl-1.5.tar.gz | 3 + prctl.changes | 8 +++ prctl.spec | 40 ++++++------ 7 files changed, 117 insertions(+), 119 deletions(-) delete mode 100644 prctl-1.3.dif delete mode 100644 prctl-1.3.tar.gz create mode 100644 prctl-1.5-Makefile.patch rename warn.patch => prctl-1.5-warnings.patch (60%) create mode 100644 prctl-1.5.tar.gz diff --git a/prctl-1.3.dif b/prctl-1.3.dif deleted file mode 100644 index 2c29841..0000000 --- a/prctl-1.3.dif +++ /dev/null @@ -1,90 +0,0 @@ ---- Makefile.in -+++ Makefile.in 2001/12/29 21:42:27 -@@ -30,26 +30,27 @@ - LIBS = @LIBS@ - CFLAGS = @CFLAGS@ - # If you want debug on by default, use: CFLAGS="-g" ./configure --LDFLAGS = $(CFLAGS) -+LDFLAGS = @LDFLAGS@ - - prefix = @prefix@ --exec_prefix = $(prefix) -+exec_prefix = @exec_prefix@ - --bindir = $(exec_prefix)/bin -+bindir = @bindir@ - scriptdir = $(bindir) - # scriptdir is the directory in which shell scripts should be installed --datadir = $(prefix)/lib --libdir = $(prefix)/lib --infodir = $(prefix)/info -+datadir = @datadir@ -+libdir = @libdir@ -+infodir = @infodir@ - - # Extension (not including `.') for the installed manual page filenames. - manext = 1 - # Where to install the manual pages. --mandir = $(prefix)/man/man$(manext) -+mandir = @mandir@ -+man1dir = $(mandir)/man$(manext) - # Use manlinks=so to use the .so method instead of hard links - manlinks = ln - --alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(mandir) -+alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(man1dir) - - #### End of system configuration section. #### - -@@ -74,23 +75,23 @@ - install: installdirs installbin installman - - installdirs: -- -if test ! -d $(prefix)/man; then \ -- mkdir $(prefix)/man; fi -+ -if test ! -d $(mandir); then \ -+ mkdir -p $(mandir); fi - -for dir in $(alldirs) ; do \ - if test ! -d $${dir}; then \ -- mkdir $${dir}; fi; \ -+ mkdir -p $${dir}; fi; \ - done - - installbin: all - $(INSTALL_PROGRAM) prctl $(bindir)/prctl -- -+ - installman: prctl.1 -- rm -f $(mandir)/prctl.$(manext) -- $(INSTALL_DATA) prctl.1 $(mandir)/prctl.$(manext) -+ rm -f $(man1dir)/prctl.$(manext) -+ $(INSTALL_DATA) prctl.1 $(man1dir)/prctl.$(manext) - - uninstall: - rm -f $(bindir)/prctl -- rm -f $(mandir)/prctl.$(manext) -+ rm -f $(man1dir)/prctl.$(manext) - - Makefile: Makefile.in ./config.status - ./config.status ---- prctl.c -+++ prctl.c 2001/12/29 21:32:38 -@@ -25,9 +25,17 @@ - #include - #include - #include --#include -+#include - #include - -+#ifndef PR_GET_FPEMU -+/* Get/set floating-point emulation control bits (if meaningful) */ -+#define PR_GET_FPEMU 9 -+#define PR_SET_FPEMU 10 -+# define PR_FPEMU_NOPRINT 1 /* silently emulate fp operations accesses */ -+# define PR_FPEMU_SIGFPE 2 /* don't emulate fp operations, send SIGFPE instead */ -+#endif -+ - /* Version */ - #define VERSION "1.3" - diff --git a/prctl-1.3.tar.gz b/prctl-1.3.tar.gz deleted file mode 100644 index 76cf0f7..0000000 --- a/prctl-1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0a9a8f3fbe60da64ac1b0d4beaf3e74872a6c137e15c09625d176f8889aff63 -size 17607 diff --git a/prctl-1.5-Makefile.patch b/prctl-1.5-Makefile.patch new file mode 100644 index 0000000..6376e47 --- /dev/null +++ b/prctl-1.5-Makefile.patch @@ -0,0 +1,82 @@ +--- + Makefile.in | 41 +++++++++++++++++++++-------------------- + 1 file changed, 21 insertions(+), 20 deletions(-) + +Index: prctl-1.5/Makefile.in +=================================================================== +--- prctl-1.5.orig/Makefile.in 2006-05-18 17:51:16.000000000 +0200 ++++ prctl-1.5/Makefile.in 2010-11-19 10:14:09.785941511 +0100 +@@ -30,26 +30,27 @@ + LIBS = @LIBS@ + CFLAGS = @CFLAGS@ + # If you want debug on by default, use: CFLAGS="-g" ./configure +-LDFLAGS = $(CFLAGS) ++LDFLAGS = @LDFLAGS@ + + prefix = @prefix@ +-exec_prefix = $(prefix) ++exec_prefix = @exec_prefix@ + +-bindir = $(exec_prefix)/bin ++bindir = @bindir@ + scriptdir = $(bindir) + # scriptdir is the directory in which shell scripts should be installed +-#datadir = $(prefix)/lib +-#libdir = $(prefix)/lib +-#infodir = $(prefix)/info ++datadir = @datadir@ ++libdir = @libdir@ ++infodir = @infodir@ + + # Extension (not including `.') for the installed manual page filenames. + manext = 1 + # Where to install the manual pages. +-mandir = $(prefix)/share/man/man$(manext) ++mandir = @mandir@ ++man1dir = $(mandir)/man$(manext) + # Use manlinks=so to use the .so method instead of hard links + manlinks = ln + +-alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(mandir) ++alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(man1dir) + + #### End of system configuration section. #### + +@@ -74,25 +75,25 @@ + install: installdirs installbin installman + + installdirs: +- -if test ! -d $(prefix)/share; then \ +- mkdir -p $(prefix)/share; fi +- -if test ! -d $(prefix)/share/man; then \ +- mkdir -p $(prefix)/share/man; fi +- -for dir in $(alldirs) ; do \ +- if test ! -d $${dir}; then \ +- mkdir -p $${dir}; fi; \ ++ -if test ! -d "$(DESTDIR)/$(mandir)"; then \ ++ mkdir -p "$(DESTDIR)/$(mandir)"; fi ++ -if test ! -d "$(DESTDIR)/$(datadir)"; then \ ++ mkdir -p "$(DESTDIR)/$(datadir)"; fi ++ -for dir in $(alldirs); do \ ++ if test ! -d $(DESTDIR)/$${dir}; then \ ++ mkdir -p $(DESTDIR)/$${dir}; fi; \ + done + + installbin: all +- $(INSTALL_PROGRAM) prctl $(bindir)/prctl ++ $(INSTALL_PROGRAM) prctl $(DESTDIR)/$(bindir)/prctl + + installman: prctl.1 +- rm -f $(mandir)/prctl.$(manext) +- $(INSTALL_DATA) prctl.1 $(mandir)/prctl.$(manext) ++ rm -f $(DESTDIR)/$(man1dir)/prctl.$(manext) ++ $(INSTALL_DATA) prctl.1 $(DESTDIR)/$(man1dir)/prctl.$(manext) + + uninstall: +- rm -f $(bindir)/prctl +- rm -f $(mandir)/prctl.$(manext) ++ rm -f $(DESTDIR)/$(bindir)/prctl ++ rm -f $(DESTDIR)/$(man1dir)/prctl.$(manext) + + Makefile: Makefile.in ./config.status + ./config.status diff --git a/warn.patch b/prctl-1.5-warnings.patch similarity index 60% rename from warn.patch rename to prctl-1.5-warnings.patch index dd50149..d7a4046 100644 --- a/warn.patch +++ b/prctl-1.5-warnings.patch @@ -1,6 +1,8 @@ ---- prctl.c -+++ prctl.c -@@ -55,12 +55,12 @@ +Index: prctl.c +=================================================================== +--- prctl.c.orig 2006-05-25 00:06:24.000000000 +0200 ++++ prctl.c 2010-11-19 10:03:03.821629772 +0100 +@@ -48,12 +48,12 @@ /* Verbose mode */ int verbose=0; @@ -15,7 +17,7 @@ { print_version(progname); printf("Usage: %s [-v] [-h|--help] [--version]\n", progname); -@@ -355,4 +355,5 @@ +@@ -374,4 +374,5 @@ exit(1); } } diff --git a/prctl-1.5.tar.gz b/prctl-1.5.tar.gz new file mode 100644 index 0000000..ae3d820 --- /dev/null +++ b/prctl-1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3fed2cec8721518179355d1a443c4be58f73ea224aa4c0cc4ba30ec87479687 +size 17507 diff --git a/prctl.changes b/prctl.changes index 26cb02b..344fe4a 100644 --- a/prctl.changes +++ b/prctl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 19 09:17:32 UTC 2010 - mvyskocil@suse.cz + +- Update to 1.5 (bugfix release) + * Better error message in case kernel does not support prctl operations. +- refresh SUSE patches +- add Changelog and COPYING to docdir + ------------------------------------------------------------------- Wed Jan 25 21:40:37 CET 2006 - mls@suse.de diff --git a/prctl.spec b/prctl.spec index 8c0cc31..782add2 100644 --- a/prctl.spec +++ b/prctl.spec @@ -20,46 +20,42 @@ Name: prctl Summary: A utility to perform process operations -Version: 1.3 -Release: 488 +Version: 1.5 +Release: 1 Group: System/Monitoring License: GPL v2 or later -Source: ftp://ftp.hp.com/pub/linux/prctl/prctl-%{version}.tar.gz -Patch: prctl-%{version}.dif -Patch1: warn.patch +URL: http://sourceforge.net/projects/prctl +Source0: prctl-%{version}.tar.gz +Patch0: prctl-1.5-Makefile.patch +Patch1: prctl-1.5-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: licenses +Requires: licenses %description The prctl utility allows a user to control certain process behaviors in the runtime environment. - - -Authors: --------- - Khalid Aziz - %prep -%setup -%patch -%patch1 +%setup -q +%patch0 -p1 -b .makefile +%patch1 -p0 -b .warnings %build -CFLAGS=$RPM_OPT_FLAGS \ - ./configure --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} -make +%{configure} %install -make install prefix=$RPM_BUILD_ROOT/usr infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} +%{makeinstall} +%{__ln_s} -f %{_datadir}/doc/licenses/GPL-2.0.txt COPYING %clean -rm -fr $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files %defattr(-, root, root) -/usr/bin/prctl -%doc %{_mandir}/man1/prctl.1.gz +%doc COPYING ChangeLog +%{_bindir}/%{name} +%doc %{_mandir}/man1/%{name}.1.* %changelog * Wed Jan 25 2006 mls@suse.de