Attachment 3165 Details for Bug 8154 – diff between mdv 2011 imported spec file and cleaned spec file

[patch] diff between mdv 2011 imported spec file and cleaned spec file

clalsadrv.specdiff (text/plain), 2.92 KB, created by Philippe Didier on 2012-11-25 17:37:57 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2012-11-25 17:37:57 CET

Size: 2.92 KB

patch

obsolete

>--- clalsadrv.specmdv	2012-11-25 17:35:30.648766089 +0100
>+++ clalsadrv.spec	2012-11-25 17:34:00.389155988 +0100
>@@ -2,49 +2,52 @@
> %define version	2.0.0
> %define release %mkrel 1
> 
>-%define major	2
>-%define libname %mklibname %name %major
>-%define oldlibname %mklibname %name 1
>+%define major		2
>+%define libname		%mklibname %name %major
>+%define oldlibname	%mklibname %name 1
> 
> Name:		%{name}
> Summary:	C++ access library for ALSA
> Version:	%{version}
> Release:	%{release}
> 
>-Source:		http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
>-URL:		http://www.kokkinizita.net/linuxaudio/
>+Source:		http://www.kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
>+URL:		http://www.kokkinizita.linuxaudio.org/linuxaudio/
> License:	GPLv2
> Group:		System/Libraries
>-BuildRoot:	%{_tmppath}/%{name}-buildroot
>+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
> BuildRequires:	alsa-lib-devel
> 
> %description
> C++ access library for ALSA
> 
>-%package -n 	%{libname}
>-Summary:        Dynamic libraries from %name
>-Group:          System/Libraries
>-Provides:	%name
>-Obsoletes:	%name = %version-%release
>-Conflicts:	%oldlibname
>+
>+%package -n %{libname}
>+Summary:	Dynamic libraries from %{name}
>+Group:		System/Libraries
>+Provides:	%{name} = %{version}-%{release}
>+Obsoletes:	%{name} < %{version}-%{release}
>+Conflicts:	%{oldlibname}
> 
> %description -n %{libname}
> Dynamic libraries from %name.
> 
>-%package -n 	%{libname}-devel
>-Summary: 	Header files and static libraries from %name
>-Group: 		Development/C
>-Requires: 	%{libname} >= %{version}
>-Provides: 	lib%{name}-devel = %{version}-%{release}
>+
>+%package -n %{libname}-devel
>+Summary:	Header files and static libraries from %name
>+Group:		Development/C
>+Requires:	%{libname} >= %{version}
>+Provides:	lib%{name}-devel = %{version}-%{release}
> Provides:	%{name}-devel = %{version}-%{release} 
>-Obsoletes: 	%name-devel
>+Obsoletes:	%{name}-devel < 2.0.0
> Conflicts:	%oldlibname-devel
> 
> %description -n %{libname}-devel
> Libraries and includes files for developing programs based on %name.
> 
>+
> %prep
>-%setup -q
>+%setup -q -n %{name}-%{version}
> cd libs
> sed -i -e 's/\-O2/\$$RPM_OPT_FLAGS$/' Makefile
> sed -i -e 's/\/sbin\/ldconfig/#\/sbin\/ldconfig/g' Makefile
>@@ -54,31 +57,20 @@
> %make
> 										
> %install
>-rm -rf $RPM_BUILD_ROOT
>-mkdir -p %buildroot/%_libdir
>-mkdir -p %buildroot/%_includedir
>+mkdir -p %{buildroot}/%{_libdir}
>+mkdir -p %{buildroot}/%{_includedir}
> cd libs
>-make install PREFIX=%buildroot/%_prefix
>-
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>+make install PREFIX=%{buildroot}/%{_prefix}
> 
>-%if %mdkversion < 200900
>-%post -n %{libname} -p /sbin/ldconfig
>-%endif
>-%if %mdkversion < 200900
>-%postun -n %{libname} -p /sbin/ldconfig
>-%endif
> 
> %files -n %{libname}
>-%defattr(-,root,root)
> %{_libdir}/*.so.*
> 
> %files -n %{libname}-devel
>-%defattr(-,root,root)
>+
> %doc AUTHORS
> %{_includedir}/*
> %{_libdir}/*.so
>-#%{_libdir}/*.a
>-#%{_libdir}/*.la
>+#%%{_libdir}/*.a
>+#%%{_libdir}/*.la
>

--- clalsadrv.specmdv	2012-11-25 17:35:30.648766089 +0100
+++ clalsadrv.spec	2012-11-25 17:34:00.389155988 +0100
@@ -2,49 +2,52 @@
 %define version	2.0.0
 %define release %mkrel 1
 
-%define major	2
-%define libname %mklibname %name %major
-%define oldlibname %mklibname %name 1
+%define major		2
+%define libname		%mklibname %name %major
+%define oldlibname	%mklibname %name 1
 
 Name:		%{name}
 Summary:	C++ access library for ALSA
 Version:	%{version}
 Release:	%{release}
 
-Source:		http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-URL:		http://www.kokkinizita.net/linuxaudio/
+Source:		http://www.kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
+URL:		http://www.kokkinizita.linuxaudio.org/linuxaudio/
 License:	GPLv2
 Group:		System/Libraries
-BuildRoot:	%{_tmppath}/%{name}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	alsa-lib-devel
 
 %description
 C++ access library for ALSA
 
-%package -n 	%{libname}
-Summary:        Dynamic libraries from %name
-Group:          System/Libraries
-Provides:	%name
-Obsoletes:	%name = %version-%release
-Conflicts:	%oldlibname
+
+%package -n %{libname}
+Summary:	Dynamic libraries from %{name}
+Group:		System/Libraries
+Provides:	%{name} = %{version}-%{release}
+Obsoletes:	%{name} < %{version}-%{release}
+Conflicts:	%{oldlibname}
 
 %description -n %{libname}
 Dynamic libraries from %name.
 
-%package -n 	%{libname}-devel
-Summary: 	Header files and static libraries from %name
-Group: 		Development/C
-Requires: 	%{libname} >= %{version}
-Provides: 	lib%{name}-devel = %{version}-%{release}
+
+%package -n %{libname}-devel
+Summary:	Header files and static libraries from %name
+Group:		Development/C
+Requires:	%{libname} >= %{version}
+Provides:	lib%{name}-devel = %{version}-%{release}
 Provides:	%{name}-devel = %{version}-%{release} 
-Obsoletes: 	%name-devel
+Obsoletes:	%{name}-devel < 2.0.0
 Conflicts:	%oldlibname-devel
 
 %description -n %{libname}-devel
 Libraries and includes files for developing programs based on %name.
 
+
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 cd libs
 sed -i -e 's/\-O2/\$\(RPM_OPT_FLAGS\)/' Makefile
 sed -i -e 's/\/sbin\/ldconfig/#\/sbin\/ldconfig/g' Makefile
@@ -54,31 +57,20 @@
 %make
 										
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p %buildroot/%_libdir
-mkdir -p %buildroot/%_includedir
+mkdir -p %{buildroot}/%{_libdir}
+mkdir -p %{buildroot}/%{_includedir}
 cd libs
-make install PREFIX=%buildroot/%_prefix
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install PREFIX=%{buildroot}/%{_prefix}
 
-%if %mdkversion < 200900
-%post -n %{libname} -p /sbin/ldconfig
-%endif
-%if %mdkversion < 200900
-%postun -n %{libname} -p /sbin/ldconfig
-%endif
 
 %files -n %{libname}
-%defattr(-,root,root)
 %{_libdir}/*.so.*
 
 %files -n %{libname}-devel
-%defattr(-,root,root)
+
 %doc AUTHORS
 %{_includedir}/*
 %{_libdir}/*.so
-#%{_libdir}/*.a
-#%{_libdir}/*.la
+#%%{_libdir}/*.a
+#%%{_libdir}/*.la

Actions: View | Diff

Attachments on bug 8154: 3126 | 3164 | 3165 | 3166 | 3167