Attachment 3161 Details for Bug 8152 – new svndiff

[patch] new svndiff

svndiff (text/plain), 3.19 KB, created by Philippe Didier on 2012-11-25 16:51:45 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2012-11-25 16:51:45 CET

Size: 3.19 KB

patch

obsolete

>Index: SPECS/clthreads.spec
>===================================================================
>--- SPECS/clthreads.spec	(rÃ©vision 321759)
>+++ SPECS/clthreads.spec	(copie de travail)
>@@ -1,42 +1,34 @@
>-%define	major	2
>-%define	libname	%mklibname %name %major
>-%define oldlibname %mklibname %name 1
>-%define	develname %mklibname %name -d
>+%define	major		2
>+%define	libname		%mklibname %name %major
>+%define	oldlibname	%mklibname %name 1
>+%define	develname	%mklibname %name -d
> 
>-Name:          clthreads
>-Summary:       Clthreads C++ libraries
>-Version:       2.4.0
>-Release:       %mkrel 2
>-License:       LGPLv2+
>-Group:	       System/Libraries 
>-Source0:       http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
>-Patch0:        clthreads-2.2.1-fix-install.patch
>-Patch1:        clthreads-2.4.0-linkage.patch
>-URL: 	       http://www.kokkinizita.net/linuxaudio/aeolus/index.html
>-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
>+Name:		clthreads
>+Summary:	C++ libraries
>+Version:	2.4.0
>+Release:	%mkrel 2
>+License:	LGPLv2+
>+Group:		System/Libraries 
>+Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
>+#Patch0:		clthreads-2.2.1-fix-install.patch
>+Patch1:		clthreads-2.4.0-linkage.patch
>+URL:		http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html
> 
> %description
> Clthreads C++ libraries
> 
> #--------------------------------------------------------------------
> 
>-%package -n	%{libname}
>-Group: 		System/Libraries
>-Summary: 	Libraries for %name
>-Obsoletes:      %{oldlibname} < 2.2.1-2
>+%package -n %{libname}
>+Group:		System/Libraries
>+Summary:	Libraries for %name
>+Obsoletes:	%{oldlibname} < 2.4.0
> 
> %description 
> Clthreads C++ libraries
> 
>-%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/libclthreads.so.%{major}*
> 
> #--------------------------------------------------------------------
>@@ -44,22 +36,21 @@
> %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:	lib%name-devel = %version-%release
>-Provides: 	%{name}-devel = %{version}-%{release}
>-Obsoletes:      %{oldlibname}-devel < 2.2.1-2Obsoletes:     
>-Obsoletes:      %{libname}-devel
>+Provides:	lib%{name}-devel = %version-%release
>+Provides:	%{name}-devel = %{version}-%{release}
>+Obsoletes:	%{oldlibname}-devel < 2.4.0
>+Obsoletes:	%{libname}-devel < 2.4.0
> 
> %description -n	%{develname}
> Development libraries from %name
> 
> %files -n %{develname}
>-%defattr (-,root,root)
>-%_includedir/clthreads.h
>-%_libdir/libclthreads.so
>+%{_includedir}/clthreads.h
>+%{_libdir}/libclthreads.so
> 
> #--------------------------------------------------------------------
> 
>@@ -71,11 +62,10 @@
> %make LDFLAGS="%{ldflags}" CPPFLAGS="%{optflags} -fPIC"
> 
> %install
>-rm -fr %buildroot
>+rm -fr %{buildroot}
> mkdir -p %{buildroot}%{_includedir}
> make install PREFIX=%{buildroot}%{_prefix}
> 
> %clean
>-rm -fr %buildroot
>+rm -fr %{buildroot}
> 
>-

Index: SPECS/clthreads.spec
===================================================================
--- SPECS/clthreads.spec	(rÃ©vision 321759)
+++ SPECS/clthreads.spec	(copie de travail)
@@ -1,42 +1,34 @@
-%define	major	2
-%define	libname	%mklibname %name %major
-%define oldlibname %mklibname %name 1
-%define	develname %mklibname %name -d
+%define	major		2
+%define	libname		%mklibname %name %major
+%define	oldlibname	%mklibname %name 1
+%define	develname	%mklibname %name -d
 
-Name:          clthreads
-Summary:       Clthreads C++ libraries
-Version:       2.4.0
-Release:       %mkrel 2
-License:       LGPLv2+
-Group:	       System/Libraries 
-Source0:       http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-Patch0:        clthreads-2.2.1-fix-install.patch
-Patch1:        clthreads-2.4.0-linkage.patch
-URL: 	       http://www.kokkinizita.net/linuxaudio/aeolus/index.html
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Name:		clthreads
+Summary:	C++ libraries
+Version:	2.4.0
+Release:	%mkrel 2
+License:	LGPLv2+
+Group:		System/Libraries 
+Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
+#Patch0:		clthreads-2.2.1-fix-install.patch
+Patch1:		clthreads-2.4.0-linkage.patch
+URL:		http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html
 
 %description
 Clthreads C++ libraries
 
 #--------------------------------------------------------------------
 
-%package -n	%{libname}
-Group: 		System/Libraries
-Summary: 	Libraries for %name
-Obsoletes:      %{oldlibname} < 2.2.1-2
+%package -n %{libname}
+Group:		System/Libraries
+Summary:	Libraries for %name
+Obsoletes:	%{oldlibname} < 2.4.0
 
 %description 
 Clthreads C++ libraries
 
-%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/libclthreads.so.%{major}*
 
 #--------------------------------------------------------------------
@@ -44,22 +36,21 @@
 %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:	lib%name-devel = %version-%release
-Provides: 	%{name}-devel = %{version}-%{release}
-Obsoletes:      %{oldlibname}-devel < 2.2.1-2Obsoletes:     
-Obsoletes:      %{libname}-devel
+Provides:	lib%{name}-devel = %version-%release
+Provides:	%{name}-devel = %{version}-%{release}
+Obsoletes:	%{oldlibname}-devel < 2.4.0
+Obsoletes:	%{libname}-devel < 2.4.0
 
 %description -n	%{develname}
 Development libraries from %name
 
 %files -n %{develname}
-%defattr (-,root,root)
-%_includedir/clthreads.h
-%_libdir/libclthreads.so
+%{_includedir}/clthreads.h
+%{_libdir}/libclthreads.so
 
 #--------------------------------------------------------------------
 
@@ -71,11 +62,10 @@
 %make LDFLAGS="%{ldflags}" CPPFLAGS="%{optflags} -fPIC"
 
 %install
-rm -fr %buildroot
+rm -fr %{buildroot}
 mkdir -p %{buildroot}%{_includedir}
 make install PREFIX=%{buildroot}%{_prefix}
 
 %clean
-rm -fr %buildroot
+rm -fr %{buildroot}
 
-

Actions: View | Diff

Attachments on bug 8152: 3121 | 3122 | 3123 | 3156 | 3157 | 3158 | 3159 | 3160 | 3161