- rel 12; make declaration match functions

diff --git a/lockdev-decl.patch b/lockdev-decl.patch
new file mode 100644 (file)
index 0000000..1921df7
--- /dev/null
+++ b/lockdev-decl.patch
@@ -0,0 +1,17 @@
+--- lockdev-1.0.3/src/ttylock.h~       2005-10-03 19:44:33.000000000 +0200
++++ lockdev-1.0.3/src/ttylock.h        2015-12-09 09:15:16.472462344 +0100
+@@ -36,10 +36,10 @@ extern "C" {
+ 
+ /* API of the library */
+ 
+-int ttylock (char * devname);
+-int ttywait (char * devname);
+-int ttyunlock (char * devname);
+-int ttylocked (char * devname);
++static inline int ttylock (char * devname);
++static inline int ttywait (char * devname);
++static inline int ttyunlock (char * devname);
++static inline int ttylocked (char * devname);
+ 
+ 
+ static inline int

diff --git a/lockdev.spec b/lockdev.spec
index b30855df947007899363d3f4b025e0766f836b9b..6dba03d51ff43f87de09786ad29603626100a89d 100644 (file)
--- a/lockdev.spec
+++ b/lockdev.spec
@@ -3,13 +3,14 @@ Summary:      A library for locking devices
 Summary(pl.UTF-8):     Biblioteka do blokowania urządzeń
 Name:          lockdev
 Version:       1.0.3
-Release:       11
+Release:       12
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       ftp://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
 # Source0-md5: 64b9c1b87b125fc348e892e24625524a
 Patch0:                %{name}-Makefile.patch
 Patch1:                %{name}-baudboy.patch
+Patch2:                %{name}-decl.patch
 BuildRequires: perl-ExtUtils-MakeMaker
 BuildRequires: rpm-perlprov
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -110,15 +111,16 @@ a ich zawartość to identyfikator (PID) procesu posiadającego blokadę.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} static \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags} -Wall"
+       CFLAGS="%{rpmcppflags} %{rpmcflags} -Wall"
 
 %{__make} shared lockdev \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags} -Wall -D_REENTRANT" \
+       CFLAGS="%{rpmcppflags} %{rpmcflags} -Wall -D_REENTRANT" \
        LCFLAGS="%{rpmldflags}"
 
 cd LockDev