commit feb78e4cb81be37d1d14c77ac6a2b956c6790c80
Author: Elan Ruusamäe <[email protected]>
Date:   Sun Feb 9 13:35:49 2014 +0200

    do not put pre-versions into version!, use our cc/cflags/ldflags

 lua-socket.spec | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/lua-socket.spec b/lua-socket.spec
index a583bd2..f77946b 100644
--- a/lua-socket.spec
+++ b/lua-socket.spec
@@ -1,11 +1,13 @@
+%define                subver  rc1
+%define                rel             1
 Summary:       LuaSocket is the most comprehensive networking support library 
for the Lua language
 Summary(hu.UTF-8):     LuaSocket egy hálózati kommunikációs könyvtár a Lua 
nyelvhez
 Name:          lua-socket
-Version:       3.0rc1
-Release:       1
+Version:       3.0
+Release:       0.%{subver}.%{rel}
 License:       BSD-like
 Group:         Development/Languages
-Source0:       https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz 
+Source0:       
https://github.com/diegonehab/luasocket/archive/v%{version}-%{subver}.tar.gz
 # Source0-md5: 08bd2f265b244eb4bf5c2c36bf89b759
 URL:           http://luaforge.net/projects/luasocket/
 BuildRequires: lua51-devel
@@ -24,30 +26,31 @@ MIME-hoz, és még sok máshoz.
 %package devel
 Summary:       Development headers for lua-socket
 Group:         Development/Libraries
-Requires:   lua51-devel
+Requires:      lua51-devel
 
 %description devel
 Development headers for lua-socket.
 
 %prep
-%setup -q -n luasocket-3.0-rc1
+%setup -q -n luasocket-%{version}-%{subver}
 
 %build
 %{__make} \
-       LUAINC=/usr/include/lua51 \
-    INSTALL_TOP_LDIR=$RPM_BUILD_ROOT%{_datadir}/lua/5.1/ \
-    INSTALL_TOP_CDIR=$RPM_BUILD_ROOT%{_libdir}/lua/5.1/
+       CC="%{__cc} %{rpmcppflags} %{rpmcflags}" \
+       LD="%{__cc} %{rpmldflags}" \
+       LUAINC=%{_includedir}/lua51 \
+       INSTALL_TOP_LDIR=$RPM_BUILD_ROOT%{_datadir}/lua/5.1/ \
+       INSTALL_TOP_CDIR=$RPM_BUILD_ROOT%{_libdir}/lua/5.1/
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} \
-       LUAINC=/usr/include/lua51 \
+%{__make} install \
+       LUAINC=%{_includedir}/lua51 \
     INSTALL_TOP_LDIR=$RPM_BUILD_ROOT%{_datadir}/lua/5.1/ \
     INSTALL_TOP_CDIR=$RPM_BUILD_ROOT%{_libdir}/lua/5.1/ \
-    install
 
 install -d $RPM_BUILD_ROOT%{_includedir}/lua51/luasocket
-install src/*.h $RPM_BUILD_ROOT%{_includedir}/lua51/luasocket/
+cp -p src/*.h $RPM_BUILD_ROOT%{_includedir}/lua51/luasocket
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,7 +62,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/lua/5.1/socket
 %attr(755,root,root) %{_libdir}/lua/5.1/mime/core.so
 %attr(755,root,root) %{_libdir}/lua/5.1/socket/core.so
-%attr(755,root,root) %{_datadir}/lua/5.1/*
+%{_datadir}/lua/5.1/*.lua
+%{_datadir}/lua/5.1/socket
 
 %files devel
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lua-socket.git/commitdiff/feb78e4cb81be37d1d14c77ac6a2b956c6790c80

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to