commit lua51-toluapp for openSUSE:Factory
Hello community,
here is the log from the commit of package lua51-toluapp for openSUSE:Factory
checked in at 2016-11-18 22:04:09
Comparing /work/SRC/openSUSE:Factory/lua51-toluapp (Old)
and /work/SRC/openSUSE:Factory/.lua51-toluapp.new (New)
Package is "lua51-toluapp"
Changes:
--- /work/SRC/openSUSE:Factory/lua51-toluapp/lua51-toluapp.changes
2016-01-08 15:23:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.lua51-toluapp.new/lua51-toluapp.changes
2016-11-18 22:04:11.0 +0100
@@ -1,0 +2,6 @@
+Tue Nov 15 09:35:21 UTC 2016 - o...@aepfle.de
+
+- Remove version and timestamp from generated files
+ toluapp-build-compare.patch
+
+---
New:
toluapp-build-compare.patch
Other differences:
--
++ lua51-toluapp.spec ++
--- /var/tmp/diff_new_pack.h2ZAaG/_old 2016-11-18 22:04:12.0 +0100
+++ /var/tmp/diff_new_pack.h2ZAaG/_new 2016-11-18 22:04:12.0 +0100
@@ -28,6 +28,7 @@
Source:
https://github.com/LuaDist/toluapp/archive/%{version}/toluapp-%{version}.tar.gz
Patch: toluapp-libdir.patch
Patch1: toluapp-versioned-shared-lib.patch
+Patch2: toluapp-build-compare.patch
BuildRequires: gcc-c++
BuildRequires: lua51-devel
BuildRequires: pkg-config
@@ -78,6 +79,7 @@
%setup -q -n toluapp-%{version}
%patch -p1
%patch1 -p1
+%patch2 -p1
sed -i "s/@SUFFIX@/%{lua_major_version}/" SConstruct
%build
++ toluapp-build-compare.patch ++
No need to record version or buildtime.
If the source changes build-compare will trigger republish.
--- a/src/bin/lua/package.lua
+++ b/src/bin/lua/package.lua
@@ -108,7 +108,7 @@ end
function classPackage:preamble ()
output('/*\n')
output('** Lua binding: '..self.name..'\n')
- output('** Generated automatically by '..TOLUA_VERSION..' on '..date()..'.\n')
+ output('** Generated automatically.\n')
output('*/\n\n')
output('#ifndef __cplusplus\n')
@@ -198,7 +198,7 @@ end
-- write header file
function classPackage:header ()
output('/*\n') output('** Lua binding: '..self.name..'\n')
- output('** Generated automatically by '..TOLUA_VERSION..' on '..date()..'.\n')
+ output('** Generated automatically.\n')
output('*/\n\n')
if not flags.h then
commit lua51-toluapp for openSUSE:Factory
Hello community,
here is the log from the commit of package lua51-toluapp for openSUSE:Factory
checked in at 2016-01-08 15:23:33
Comparing /work/SRC/openSUSE:Factory/lua51-toluapp (Old)
and /work/SRC/openSUSE:Factory/.lua51-toluapp.new (New)
Package is "lua51-toluapp"
Changes:
--- /work/SRC/openSUSE:Factory/lua51-toluapp/lua51-toluapp.changes
2015-11-26 17:02:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.lua51-toluapp.new/lua51-toluapp.changes
2016-01-08 15:23:42.0 +0100
@@ -1,0 +2,8 @@
+Thu Jan 7 04:17:11 UTC 2016 - i...@marguerite.su
+
+- rename the library to libtolua++-5.1
+- libtolua++-5_1-devel should require toluapp-5.1,
+ which will require the library
+- fix build on openSUSE without lua-5.1.pc
+
+---
Other differences:
--
++ lua51-toluapp.spec ++
--- /var/tmp/diff_new_pack.yWUkHp/_old 2016-01-08 15:23:43.0 +0100
+++ /var/tmp/diff_new_pack.yWUkHp/_new 2016-01-08 15:23:43.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package lua51-toluapp
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,7 +42,7 @@
* support for class templates
as well as other features and bugfixes.
-%package -n toluapp-%{lua_suffix}
+%package -n toluapp-%{lua_major_version}
Summary:C/C++ with Lua Integration Tool
Group: Development/Languages/Lua
Requires(preun): update-alternatives
@@ -51,7 +51,7 @@
Provides: tolua++ = %{version}-99.1
Obsoletes: tolua++ < %{version}-99.1
-%description -n toluapp-%{lua_suffix}
+%description -n toluapp-%{lua_major_version}
tolua++ is an extended version of tolua, a tool to integrate C/C++ code with
Lua. tolua++ includes new features oriented to c++ such as:
* support for std::string as a basic type (this can be turned off by a command
@@ -59,26 +59,26 @@
* support for class templates
as well as other features and bugfixes.
-%package -n libtoluapp-%{lua_suffix}-1
-Summary:Runtime libraries for toluapp
+%package -n libtolua++-%{lua_suffix}-1
+Summary:Runtime libraries for tolua++
Group: System/Libraries
-%description -n libtoluapp-%{lua_suffix}-1
-This package provides shared libraries for toluapp.
+%description -n libtolua++-%{lua_suffix}-1
+This package provides shared libraries for tolua++.
-%package -n libtoluapp-%{lua_suffix}-devel
-Summary:Development headers for toluapp
+%package -n libtolua++-%{lua_suffix}-devel
+Summary:Development headers for tolua++
Group: Development/Libraries/C and C++
-Requires: libtoluapp-%{lua_suffix}-1
+Requires: toluapp-%{lua_major_version}
-%description -n libtoluapp-%{lua_suffix}-devel
-This package provides development headers for toluapp.
+%description -n libtolua++-%{lua_suffix}-devel
+This package provides development headers for tolua++.
%prep
%setup -q -n toluapp-%{version}
%patch -p1
%patch1 -p1
-sed -i "s/@SUFFIX@/%{lua_suffix}/" SConstruct
+sed -i "s/@SUFFIX@/%{lua_major_version}/" SConstruct
%build
cat <<'EOF' > config_linux.py
@@ -89,8 +89,8 @@
prefix = "%{_prefix}"
EOF
-CCFLAGS="%{optflags} `pkg-config lua-%{lua_major_version} --cflags` -fPIC" \
-LIBS="`pkg-config lua-%{lua_major_version} --libs-only-l`" \
+CCFLAGS="%{optflags} -fPIC" \
+LIBS="-llua -lm -ldl" \
scons %{?_smp_mflags} \
prefix="%{_prefix}" \
libdir="%{_libdir}" \
@@ -98,8 +98,8 @@
lib bin
%install
-CCFLAGS="%{optflags} `pkg-config lua-%{lua_major_version} --cflags` -fPIC" \
-LIBS="`pkg-config lua-%{lua_major_version} --libs-only-l`" \
+CCFLAGS="%{optflags} -fPIC" \
+LIBS="-llua -lm -ldl" \
scons %{?_smp_flags} \
prefix="%{buildroot}%{_prefix}" \
libdir="%{buildroot}%{_libdir}" \
@@ -108,58 +108,57 @@
# pkgconfig file
mkdir -p %{buildroot}%{_libdir}/pkgconfig
-cat > %{buildroot}%{_libdir}/pkgconfig/toluapp.pc << EOF
+cat > %{buildroot}%{_libdir}/pkgconfig/tolua++.pc << EOF
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
sharedlibdir=%{_libdir}
includedir=%{_includedir}
-Name: toluapp
+Name: tolua++
Description: C/C++ with Lua Integration Tool
Version: %{version}
-Requires:
-Libs: -ltoluapp-%{lua_suffix}
+Libs: -ltolua++-%{lua_major_version}
Cflags: -I%{_includedir}
EOF
# update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
-touch %{buildroot}%{_sysconfdir}/alternatives/toluapp
-ln -sf %{_sysconfdir}/alternatives/toluapp %{buildroot}%{_bindir}/tolua++
+touch
commit lua51-toluapp for openSUSE:Factory
Hello community,
here is the log from the commit of package lua51-toluapp for openSUSE:Factory
checked in at 2015-11-26 17:01:49
Comparing /work/SRC/openSUSE:Factory/lua51-toluapp (Old)
and /work/SRC/openSUSE:Factory/.lua51-toluapp.new (New)
Package is "lua51-toluapp"
Changes:
--- /work/SRC/openSUSE:Factory/lua51-toluapp/lua51-toluapp.changes
2015-10-26 12:47:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.lua51-toluapp.new/lua51-toluapp.changes
2015-11-26 17:02:11.0 +0100
@@ -1,0 +2,7 @@
+Tue Nov 10 12:26:18 UTC 2015 - m...@suse.com
+
+- Don't version pkgconfig file
+- Delete toluapp-versioned-include.patch
+ * still have packages rely on tolua++.h
+
+---
Old:
toluapp-versioned-include.patch
Other differences:
--
++ lua51-toluapp.spec ++
--- /var/tmp/diff_new_pack.1nUiob/_old 2015-11-26 17:02:12.0 +0100
+++ /var/tmp/diff_new_pack.1nUiob/_new 2015-11-26 17:02:12.0 +0100
@@ -28,11 +28,10 @@
Source:
https://github.com/LuaDist/toluapp/archive/%{version}/toluapp-%{version}.tar.gz
Patch: toluapp-libdir.patch
Patch1:toluapp-versioned-shared-lib.patch
-Patch2:toluapp-versioned-include.patch
BuildRequires: gcc-c++
+BuildRequires: lua51-devel
BuildRequires: pkg-config
BuildRequires: scons >= 2.3.0
-BuildRequires: lua51-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -79,7 +78,6 @@
%setup -q -n toluapp-%{version}
%patch -p1
%patch1 -p1
-%patch2 -p1
sed -i "s/@SUFFIX@/%{lua_suffix}/" SConstruct
%build
@@ -110,20 +108,20 @@
# pkgconfig file
mkdir -p %{buildroot}%{_libdir}/pkgconfig
-cat > %{buildroot}%{_libdir}/pkgconfig/toluapp-%{lua_suffix}.pc << EOF
+cat > %{buildroot}%{_libdir}/pkgconfig/toluapp.pc << EOF
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
sharedlibdir=%{_libdir}
includedir=%{_includedir}
-Name: toluapp-%{lua_suffix}
+Name: toluapp
Description: C/C++ with Lua Integration Tool
Version: %{version}
Requires:
Libs: -ltoluapp-%{lua_suffix}
-Cflags: -I%{_includedir}/toluapp-%{lua_suffix}
+Cflags: -I%{_includedir}
EOF
# update-alternatives
@@ -155,10 +153,9 @@
%files -n libtoluapp-%{lua_suffix}-devel
%defattr(-,root,root)
-%dir %{_includedir}/toluapp-%{lua_suffix}
-%{_includedir}/toluapp-%{lua_suffix}/toluapp.h
+%{_includedir}/tolua++.h
%{_libdir}/libtoluapp-%{lua_suffix}.so
-%{_libdir}/pkgconfig/toluapp-%{lua_suffix}.pc
+%{_libdir}/pkgconfig/toluapp.pc
%files -n libtoluapp-%{lua_suffix}-1
%defattr(-,root,root)
