Index: work/OS/Mageia/pcb-rnd.spec =================================================================== --- work/OS/Mageia/pcb-rnd.spec (revision 19577) +++ work/OS/Mageia/pcb-rnd.spec (revision 19578) @@ -1,28 +1,23 @@ # Build with --debug (1) or --symbols (0) %define debug 0 %define plugindir %{_usr}/lib/%{name}/plugins -# Replace svn commit revision in next line with 0 for full releases -%define svn 0 -%define rel 1 + +# comment out if not svn snapshot +#define svn 0 + +%define rel 3 + Name: pcb-rnd Version: 2.0.0 -%if %{svn} == 0 -Release: %mkrel %{rel} -%else -Release: %mkrel -c %{svn} %{rel} -%endif +Release: %mkrel %{?svn:0.%svn.}%{rel} Summary: Standard installation License: GPLv2+ and LGPLv2+ and BSD Group: Sciences/Other URL: http://repo.hu/projects/pcb-rnd # http://repo.hu/projects/pcb-rnd/developer/packaging/packages.html -%if %{svn} == 0 -Source0: http://repo.hu/projects/%{name}/releases/%{name}-%{version}.tar.gz -%else -Source0: %{name}-%{svn}.tar.gz -%endif +Source0: http://repo.hu/projects/%{name}/releases/%{name}-%{?svn}%{!?svn:%version}.tar.gz # Run mk-tar script in SOURCES/ to generate a snapshot tarball from svn trunk. -# Use the svn revision # (in tarball name) in line #5 above. +# Use the svn revision # in line #6 above. Source1: mk-tar Source2: logo.svg Source3: pcb-rnd.desktop @@ -30,7 +25,7 @@ Source5: pcb-rnd-gtk2-gl.desktop Source6: pcb-rnd-lesstif.desktop -BuildRequires: lesstif-devel +BuildRequires: motif-devel BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(gl) @@ -217,11 +212,7 @@ Support library for alien file formats. %prep -%if %{svn} == 0 -%autosetup -n %{name}-%{version} -p1 -%else -%autosetup -n %{name}-%{svn} -p1 -%endif +%autosetup -n %{name}-%{?svn}%{!?svn:%version} -p1 %build ./configure \ @@ -254,7 +245,7 @@ prefix=/usr --symbols %endif -%make_build +make %install %make_install @@ -388,7 +379,7 @@ %{plugindir}/hid_gtk2_gl.pup %{plugindir}/hid_gtk2_gl.so %{_datadir}/applications/%{name}-gtk2-gl.desktop - + %files hid-lesstif %{plugindir}/hid_lesstif.pup %{plugindir}/hid_lesstif.so