Request 152 (accepted)

Overview

Request 152 (accepted)

- Cleaned up spec file formatting - Added 32bit compatibility package (needed by gstreamer-0_10-plugins-bad-orig-addon-32bit)

Created by TheBlackCat over 11 years ago
In state accepted
Package maintainers: detrei and mantre

Submit xvid

Submit package home:TheBlackCat / xvid to package Essentials / xvid

xvidcore.changes Changed

xvidcore.spec Changed

@@ -1,21 +1,22 @@
-# norootforbuild
-
-%define soname  4
-
 Name:           xvidcore
 Version:        1.3.2
+%define soname  4
 Release:        1
+License:        GPL-2.0+
 Summary:        Xvid is a high quality MPEG-4 ASP video codec
 Summary(de):    Xvid ist ein hochqualitativer MPEG-4 ASP Videocodec
-License:        GPLv2+
+Url:            http://www.xvid.org/
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-URL:            http://www.xvid.org/
 Source0:        http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
-Requires:       lib%{name}%{soname} = %{version}-%{release}
-Obsoletes:      xvid < %{version}-%{release}
-Provides:       xvid = %{version}-%{release}
-BuildRequires:  gcc-c++ make pkgconfig nasm
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
+Source1:        baselibs.conf
+BuildRequires:  gcc-c++
+BuildRequires:  make
+BuildRequires:  nasm
+BuildRequires:  pkgconfig
+Requires:       lib%{name}%{soname} = %{version}
+Provides:       xvid = %{version}
+Obsoletes:      xvid < %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Xvid is a high quality MPEG-4 ASP video codec.
@@ -33,9 +34,9 @@
 Summary:        Development files of XviD video codec
 Summary(de):    Entwicklerdateien des XviD Video-Codecs
 Group:          Development/Libraries/C and C++
-Requires:       lib%{name}%{soname} = %{version}-%{release}
-Obsoletes:      xvid-devel
-Provides:       xvid-devel = %{version}-%{release}
+Requires:       lib%{name}%{soname} = %{version}
+Provides:       xvid-devel = %{version}
+Obsoletes:      xvid-devel < %{version}
 
 %description -n lib%{name}-devel
 Xvid is a high quality MPEG-4 ASP video codec.
@@ -65,30 +66,30 @@
 %build
 pushd build/generic
 %configure
-%__make %{?jobs:-j%{jobs}}
+make %{?_smp_mflags}
 popd #build/generic
 
 %install
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}
 mkdir %{buildroot}
-%__install -d "%{buildroot}%{_libdir}"
-%__install -d "%{buildroot}%{_includedir}"
+install -d "%{buildroot}%{_libdir}"
+install -d "%{buildroot}%{_includedir}"
 
 pushd 'build/generic/=build'
-%__install *.so* "%{buildroot}%{_libdir}/"
+install *.so* "%{buildroot}%{_libdir}/"
 popd #'build/generic/=build'
 
 pushd src
-%__install xvid.h "%{buildroot}%{_includedir}/"
+install xvid.h "%{buildroot}%{_includedir}/"
 popd #src
 
 pushd "%{buildroot}%{_libdir}"
-%__ln_s libxvidcore.so.%{soname}.* libxvidcore.so.%{soname}
-%__ln_s libxvidcore.so.%{soname} libxvidcore.so
+ln -s libxvidcore.so.%{soname}.* libxvidcore.so.%{soname}
+ln -s libxvidcore.so.%{soname} libxvidcore.so
 popd #libdir
 
 %clean
-[ "%{buildroot}" != "/" ] && %__rm -rf "%{buildroot}"
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}
 
 %post   -n lib%{name}%{soname} -p /sbin/ldconfig
 %postun -n lib%{name}%{soname} -p /sbin/ldconfig
@@ -105,7 +106,6 @@
 
 %files -n lib%{name}%{soname}
 %defattr(644,root,root)
-%{_libdir}/libxvidcore.so.%{soname}
-%{_libdir}/libxvidcore.so.%{soname}.*
+%{_libdir}/libxvidcore.so.%{soname}*
 
 %changelog

baselibs.conf Added

Build Results
RPM Lint

Refresh

Comments for request 152 0

Request History

TheBlackCat created request over 11 years ago

- Cleaned up spec file formatting - Added 32bit compatibility package (needed by gstreamer-0_10-plugins-bad-orig-addon-32bit)

pbleser accepted request over 12 years ago

ok, but please do NOT remove the two lines with .so and .so.*, it's on purpose (and better) :)