Attachment 7775 Details for Bug 17528 – quazip.spec.diff

[patch] quazip.spec.diff

quazip.spec.diff (text/plain), 3.75 KB, created by David GEIGER on 2016-05-10 09:17:47 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: David GEIGER

Created: 2016-05-10 09:17:47 CEST

Size: 3.75 KB

patch

obsolete

>Index: quazip.spec
>===================================================================
>--- quazip.spec	(revision 1011952)
>+++ quazip.spec	(working copy)
>@@ -1,6 +1,6 @@
> Name:		quazip
> Version:	0.7.2
>-Release:	%mkrel 1
>+Release:	%mkrel 2
> Summary:	Qt/C++ wrapper for the minizip library
> License:	LGPLv2+
> Group:		Development/C++
>@@ -7,7 +7,7 @@
> URL:		http://quazip.sourceforge.net/
> Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
> Patch0:		quazip-0.7.2-fix_static.patch
>-BuildRequires:	pkgconfig(Qt5Core)
>+BuildRequires:	qt4-devel
> BuildRequires:	qt5-devel
> BuildRequires:	pkgconfig(zlib)
> BuildRequires:	pkgconfig(libzip)
>@@ -27,6 +27,8 @@
> from and writing to ZIP archives.
> 
> #------------------------------------------------------------------------------
>+### Qt5 ###
>+
> %define quazip_major 1
> %define libquazip %mklibname quazip 5 %{quazip_major}
> 
>@@ -34,11 +36,12 @@
> Summary: Runtime library for %{name}
> Group: System/Libraries
> Obsoletes: %{name} < 0.7
>+
> %description -n %libquazip
> QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
> can be used to access ZIP archives.
> 
>-This package provides the runtime library.
>+This package provides the Qt5 runtime library.
> 
> %files -n %libquazip
> %{_libdir}/lib%{name}5.so.%{quazip_major}{,.*}
>@@ -61,27 +64,85 @@
> QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
> can be used to access ZIP archives.
> 
>-This package provides the headers files need to build a package against
>+This package provides the Qt5 headers files needed to build a package against
> %{name}.
> 
> %files -n %develquazip
> %doc doc/html
> %doc COPYING README.txt NEWS.txt
>-%{_includedir}/%{name}5
>+%{_includedir}/%{name}5/
> %{_libdir}/lib%{name}5.so
> %{_datadir}/cmake/Modules/FindQuaZip5.cmake
> 
>+### End Qt5 ###
>+
> #------------------------------------------------------------------------------
> 
>+### QT4 ####
>+
>+%define quazip_qt4_major 1
>+%define libquazip_qt4 %mklibname quazip %{quazip_qt4_major}
>+
>+%package -n %libquazip_qt4
>+Summary: Qt4 Runtime library for %{name}
>+Group: System/Libraries
>+
>+%description -n %libquazip_qt4
>+QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
>+can be used to access ZIP archives.
>+
>+This package provides the Qt4 runtime library.
>+
>+%files -n %libquazip_qt4
>+%{_libdir}/lib%{name}.so.%{quazip_qt4_major}{,.*}
>+
>+#------------------------------------------------------------------------------
>+
>+%define develquazip_qt4 %mklibname quazip-qt4 -d
>+
>+%package -n %develquazip_qt4
>+Summary:	Development files for %{name}
>+Group:		Development/C++
>+Requires:	%libquazip_qt4 = %{version}-%{release}
>+Requires:	pkgconfig(libzip)
>+Provides:	lib%{name}-qt4-devel = %{version}-%{release}
>+Provides:	%{name}-qt4-devel = %{version}-%{release}
>+
>+%description -n %develquazip_qt4
>+QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
>+can be used to access ZIP archives.
>+
>+This package provides the Qt4 headers files needed to build a package against
>+%{name}.
>+
>+%files -n %develquazip_qt4
>+%doc doc/html
>+%doc COPYING README.txt NEWS.txt
>+%{_includedir}/%{name}/
>+%{_libdir}/lib%{name}.so
>+%{_datadir}/cmake/Modules/FindQuaZip.cmake
>+
>+### End Qt4 ###
>+#------------------------------------------------------------------------------
>+
> %prep
> %setup -q
> %autopatch -p1 
> 
> %build
>-%cmake_qt5 
>+### Build Qt5 ###
>+mkdir build-qt5
>+pushd build-qt5
>+%cmake_qt5 ../.. -DBUILD_WITH_QT4:BOOL=OFF
> %make
>-
>-cd ..
>+popd
>+### Build Qt4 ###
>+mkdir build-qt4
>+pushd build-qt4
>+%cmake_qt4 ../.. -DBUILD_WITH_QT4:BOOL=ON
>+%make
>+popd
>+### Build doc ###
> doxygen Doxyfile
> for file in doc/html/*; do
>        touch -r Doxyfile $file
>@@ -88,4 +149,5 @@
> done
> 
> %install
>-%makeinstall_std -C build
>+%make_install -C build-qt5/build
>+%make_install -C build-qt4/build

Index: quazip.spec
===================================================================
--- quazip.spec	(revision 1011952)
+++ quazip.spec	(working copy)
@@ -1,6 +1,6 @@
 Name:		quazip
 Version:	0.7.2
-Release:	%mkrel 1
+Release:	%mkrel 2
 Summary:	Qt/C++ wrapper for the minizip library
 License:	LGPLv2+
 Group:		Development/C++
@@ -7,7 +7,7 @@
 URL:		http://quazip.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		quazip-0.7.2-fix_static.patch
-BuildRequires:	pkgconfig(Qt5Core)
+BuildRequires:	qt4-devel
 BuildRequires:	qt5-devel
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:	pkgconfig(libzip)
@@ -27,6 +27,8 @@
 from and writing to ZIP archives.
 
 #------------------------------------------------------------------------------
+### Qt5 ###
+
 %define quazip_major 1
 %define libquazip %mklibname quazip 5 %{quazip_major}
 
@@ -34,11 +36,12 @@
 Summary: Runtime library for %{name}
 Group: System/Libraries
 Obsoletes: %{name} < 0.7
+
 %description -n %libquazip
 QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
 can be used to access ZIP archives.
 
-This package provides the runtime library.
+This package provides the Qt5 runtime library.
 
 %files -n %libquazip
 %{_libdir}/lib%{name}5.so.%{quazip_major}{,.*}
@@ -61,27 +64,85 @@
 QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
 can be used to access ZIP archives.
 
-This package provides the headers files need to build a package against
+This package provides the Qt5 headers files needed to build a package against
 %{name}.
 
 %files -n %develquazip
 %doc doc/html
 %doc COPYING README.txt NEWS.txt
-%{_includedir}/%{name}5
+%{_includedir}/%{name}5/
 %{_libdir}/lib%{name}5.so
 %{_datadir}/cmake/Modules/FindQuaZip5.cmake
 
+### End Qt5 ###
+
 #------------------------------------------------------------------------------
 
+### QT4 ####
+
+%define quazip_qt4_major 1
+%define libquazip_qt4 %mklibname quazip %{quazip_qt4_major}
+
+%package -n %libquazip_qt4
+Summary: Qt4 Runtime library for %{name}
+Group: System/Libraries
+
+%description -n %libquazip_qt4
+QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
+can be used to access ZIP archives.
+
+This package provides the Qt4 runtime library.
+
+%files -n %libquazip_qt4
+%{_libdir}/lib%{name}.so.%{quazip_qt4_major}{,.*}
+
+#------------------------------------------------------------------------------
+
+%define develquazip_qt4 %mklibname quazip-qt4 -d
+
+%package -n %develquazip_qt4
+Summary:	Development files for %{name}
+Group:		Development/C++
+Requires:	%libquazip_qt4 = %{version}-%{release}
+Requires:	pkgconfig(libzip)
+Provides:	lib%{name}-qt4-devel = %{version}-%{release}
+Provides:	%{name}-qt4-devel = %{version}-%{release}
+
+%description -n %develquazip_qt4
+QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
+can be used to access ZIP archives.
+
+This package provides the Qt4 headers files needed to build a package against
+%{name}.
+
+%files -n %develquazip_qt4
+%doc doc/html
+%doc COPYING README.txt NEWS.txt
+%{_includedir}/%{name}/
+%{_libdir}/lib%{name}.so
+%{_datadir}/cmake/Modules/FindQuaZip.cmake
+
+### End Qt4 ###
+#------------------------------------------------------------------------------
+
 %prep
 %setup -q
 %autopatch -p1 
 
 %build
-%cmake_qt5 
+### Build Qt5 ###
+mkdir build-qt5
+pushd build-qt5
+%cmake_qt5 ../.. -DBUILD_WITH_QT4:BOOL=OFF
 %make
-
-cd ..
+popd
+### Build Qt4 ###
+mkdir build-qt4
+pushd build-qt4
+%cmake_qt4 ../.. -DBUILD_WITH_QT4:BOOL=ON
+%make
+popd
+### Build doc ###
 doxygen Doxyfile
 for file in doc/html/*; do
        touch -r Doxyfile $file
@@ -88,4 +149,5 @@
 done
 
 %install
-%makeinstall_std -C build
+%make_install -C build-qt5/build
+%make_install -C build-qt4/build

Actions: View | Diff

Attachments on bug 17528: 7775 | 8360