Hello community, here is the log from the commit of package lua for openSUSE:Factory checked in at 2012-04-12 09:39:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua (Old) and /work/SRC/openSUSE:Factory/.lua.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lua", Maintainer is "PGajdos@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lua/lua.changes 2012-01-20 22:07:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lua.new/lua.changes 2012-04-12 09:39:30.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 29 19:29:57 UTC 2012 - joop.boonen@opensuse.org + +- Correction in Provides and Obsolete for lua-libs +- Passed the spec file through spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua.spec ++++++ --- /var/tmp/diff_new_pack.B4HWgc/_old 2012-04-12 09:39:32.000000000 +0200 +++ /var/tmp/diff_new_pack.B4HWgc/_new 2012-04-12 09:39:32.000000000 +0200 @@ -15,15 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: lua Version: 5.2.0 Release: 0 -%define major_version 5.2 -%define libsuf 5_2 -BuildRequires: pkg-config -BuildRequires: readline-devel -BuildRequires: update-alternatives -PreReq: update-alternatives Summary: Small Embeddable Language with Simple Procedural Syntax License: MIT Group: System/Libraries @@ -33,7 +29,13 @@ Source2: baselibs.conf # prefix and build shared libraries (upstream don't want this in Makefile) Patch0: %{name}-suse.diff +%define major_version 5.2 +%define libsuf 5_2 +BuildRequires: pkg-config +BuildRequires: readline-devel +BuildRequires: update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(pre): update-alternatives %description Lua is a programming language originally designed for extending @@ -67,8 +69,8 @@ %package -n liblua%{libsuf} Summary: Small Embeddable Language with Simple Procedural Syntax Group: System/Libraries -Provides: %{name}-libs = 5.1.3 -Obsoletes: %{name}-libs <= 5.1.3 +Provides: %{name}-libs = %{version} +Obsoletes: %{name}-libs < %{version} %description -n liblua%{libsuf} Lua is a programming language originally designed for extending @@ -108,34 +110,31 @@ %patch0 -p1 %build -make %{?_smp_mflags} -C src CC="%{__cc}" MYCFLAGS="$RPM_OPT_FLAGS -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all +make %{?_smp_mflags} -C src CC="gcc" MYCFLAGS="%{optflags} -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all %install -make install INSTALL_TOP="$RPM_BUILD_ROOT%{_prefix}" INSTALL_LIB="$RPM_BUILD_ROOT%{_libdir}" INSTALL_CMOD=$RPM_BUILD_ROOT%{_libdir}/lua/%{major_version} INSTALL_MAN="$RPM_BUILD_ROOT%{_mandir}/man1" +make install INSTALL_TOP="%{buildroot}%{_prefix}" INSTALL_LIB="%{buildroot}%{_libdir}" INSTALL_CMOD=%{buildroot}%{_libdir}/lua/%{major_version} INSTALL_MAN="%{buildroot}%{_mandir}/man1" for file in lua luac ; do mv "%{buildroot}%{_bindir}/${file}" "%{buildroot}%{_bindir}/${file}%{major_version}" mv "%{buildroot}%{_mandir}/man1/${file}.1" "%{buildroot}%{_mandir}/man1/${file}%{major_version}.1" done -install -D %{SOURCE1} %buildroot/etc/rpm/macros.lua +install -D %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.lua # create pkg-config file cat > lua.pc <<-EOF -prefix=%_prefix -exec_prefix=%_prefix -libdir=%_libdir -includedir=%_prefix}/include +prefix=%{_prefix} +exec_prefix=%{_prefix} +libdir=%{_libdir} +includedir=%{_prefix}}/include Name: Lua Description: An Extensible Extension Language -Version: %version +Version: %{version} Requires: Libs: -llua -lm Cflags: EOF -install -D -m 644 lua.pc %buildroot/%_libdir/pkgconfig/lua.pc - -%clean -rm -rf $RPM_BUILD_ROOT +install -D -m 644 lua.pc %{buildroot}/%{_libdir}/pkgconfig/lua.pc %post /usr/sbin/update-alternatives --install \ @@ -158,13 +157,13 @@ %doc README %{_mandir}/man1/lua%{major_version}.1* %{_mandir}/man1/luac%{major_version}.1* -%{_prefix}/bin/lua%{major_version} -%{_prefix}/bin/luac%{major_version} +%{_bindir}/lua%{major_version} +%{_bindir}/luac%{major_version} %dir %{_libdir}/lua %dir %{_libdir}/lua/%{major_version} %dir %{_datadir}/lua %dir %{_datadir}/lua/%{major_version} -/etc/rpm/macros.lua +%{_sysconfdir}/rpm/macros.lua %files -n liblua%{libsuf} %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org