Attachment 3163 Details for Bug 8153 – diff between mdv imported spec file and cleaned spec file

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

clxclient.specdiff (text/plain), 2.87 KB, created by Philippe Didier on 2012-11-25 17:13:18 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2012-11-25 17:13:18 CET

Size: 2.87 KB

patch

obsolete

>--- clxclient.specmdv	2012-11-25 16:44:29.141471203 +0100
>+++ clxclient.spec	2012-11-25 17:04:16.446594080 +0100
>@@ -2,64 +2,52 @@
> %define	libname	%mklibname %{name} %{major}
> %define	develname %mklibname %{name} -d
> 
>-Name:          clxclient
>-Summary:       Clxclient C++ libraries
>-Version:       3.6.1
>-Release:       %mkrel 2
>-License:       LGPLv2+
>-Group:	       System/Libraries 
>-Source0:       http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
>-Patch0:        clxclient-3.6.1-linkage.patch
>-URL: 	       http://www.kokkinizita.net/linuxaudio/
>-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
>+Name:		clxclient
>+Summary:	C++ libraries
>+Version:	3.6.1
>+Release:	%mkrel 2
>+License:	LGPLv2+
>+Group:		System/Libraries 
>+Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
>+Patch0:		clxclient-3.6.1-linkage.patch
>+URL:		http://kokkinizita.linuxaudio.org/linuxaudio/
> 
>-BuildRequires: clthreads-devel
>-BuildRequires: x11-proto-devel
>-BuildRequires: libxft-devel
>+BuildRequires:	clthreads-devel
>+BuildRequires:	x11-proto-devel
>+BuildRequires:	libxft-devel
> 
> %description
>-Clthreads C++ libraries
>+C++ libraries needed by aeolus
> 
> #--------------------------------------------------------------------
> 
>-%package -n	%{libname}
>-Group: 		System/Libraries
>-Summary: 	Libraries for %{name}
>-Provides: 	lib%{name} = %{version}-%{release}
>+%package -n %{libname}
>+Group:		System/Libraries
>+Summary:	Libraries for %{name}
>+Provides:	lib%{name} = %{version}-%{release}
> 
>-%description 
>-Clxclient C++ libraries
>+%description -n	%{libname}
>+The libraries from %{name} package needed by aeolus
> 
>-%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/libclxclient.so.%{major}*
>+%{_libdir}/libclxclient.so.%{major}*
> 
> #--------------------------------------------------------------------
> 
>-%description -n	%{libname}
>-The libraries from %name package
>-
>-%package -n	%{develname}
>-Group: 		Development/Other
>-Summary: 	Libraries for %name
>+%package -n %{develname}
>+Group:		Development/Other
>+Summary:	Libraries for %name
> Requires:	%{libname} = %{version}-%{release}
>-Provides: 	%{name}-devel = %{version}-%{release}
>-Obsoletes: 	%{libname}-devel
>+Provides:	%{name}-devel = %{version}-%{release}
>+Obsoletes:	%{libname}-devel
> 
> %description -n	%{develname}
> Development libraries from %name
> 
> %files -n %{develname}
>-%defattr (-,root,root)
>-%_includedir/clxclient.h
>-%_libdir/libclxclient.so
>+%{_includedir}/clxclient.h
>+%{_libdir}/libclxclient.so
> 
> #--------------------------------------------------------------------
> 
>@@ -71,9 +59,6 @@
> %make LDFLAGS="%{ldflags}"
> 
> %install
>-rm -fr %buildroot
>-mkdir -p %buildroot%_includedir
> make install PREFIX=%{buildroot}%{_prefix}
> 
>-%clean
>-rm -fr %buildroot
>+

--- clxclient.specmdv	2012-11-25 16:44:29.141471203 +0100
+++ clxclient.spec	2012-11-25 17:04:16.446594080 +0100
@@ -2,64 +2,52 @@
 %define	libname	%mklibname %{name} %{major}
 %define	develname %mklibname %{name} -d
 
-Name:          clxclient
-Summary:       Clxclient C++ libraries
-Version:       3.6.1
-Release:       %mkrel 2
-License:       LGPLv2+
-Group:	       System/Libraries 
-Source0:       http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-Patch0:        clxclient-3.6.1-linkage.patch
-URL: 	       http://www.kokkinizita.net/linuxaudio/
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Name:		clxclient
+Summary:	C++ libraries
+Version:	3.6.1
+Release:	%mkrel 2
+License:	LGPLv2+
+Group:		System/Libraries 
+Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
+Patch0:		clxclient-3.6.1-linkage.patch
+URL:		http://kokkinizita.linuxaudio.org/linuxaudio/
 
-BuildRequires: clthreads-devel
-BuildRequires: x11-proto-devel
-BuildRequires: libxft-devel
+BuildRequires:	clthreads-devel
+BuildRequires:	x11-proto-devel
+BuildRequires:	libxft-devel
 
 %description
-Clthreads C++ libraries
+C++ libraries needed by aeolus
 
 #--------------------------------------------------------------------
 
-%package -n	%{libname}
-Group: 		System/Libraries
-Summary: 	Libraries for %{name}
-Provides: 	lib%{name} = %{version}-%{release}
+%package -n %{libname}
+Group:		System/Libraries
+Summary:	Libraries for %{name}
+Provides:	lib%{name} = %{version}-%{release}
 
-%description 
-Clxclient C++ libraries
+%description -n	%{libname}
+The libraries from %{name} package needed by aeolus
 
-%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/libclxclient.so.%{major}*
+%{_libdir}/libclxclient.so.%{major}*
 
 #--------------------------------------------------------------------
 
-%description -n	%{libname}
-The libraries from %name package
-
-%package -n	%{develname}
-Group: 		Development/Other
-Summary: 	Libraries for %name
+%package -n %{develname}
+Group:		Development/Other
+Summary:	Libraries for %name
 Requires:	%{libname} = %{version}-%{release}
-Provides: 	%{name}-devel = %{version}-%{release}
-Obsoletes: 	%{libname}-devel
+Provides:	%{name}-devel = %{version}-%{release}
+Obsoletes:	%{libname}-devel
 
 %description -n	%{develname}
 Development libraries from %name
 
 %files -n %{develname}
-%defattr (-,root,root)
-%_includedir/clxclient.h
-%_libdir/libclxclient.so
+%{_includedir}/clxclient.h
+%{_libdir}/libclxclient.so
 
 #--------------------------------------------------------------------
 
@@ -71,9 +59,6 @@
 %make LDFLAGS="%{ldflags}"
 
 %install
-rm -fr %buildroot
-mkdir -p %buildroot%_includedir
 make install PREFIX=%{buildroot}%{_prefix}
 
-%clean
-rm -fr %buildroot
+

Actions: View | Diff

Attachments on bug 8153: 3124 | 3125 | 3162 | 3163