Author: sparky Date: Fri Feb 19 20:10:41 2010 GMT Module: packages Tag: HEAD ---- Log message: - remove -Wmissing-prototypes because it isn't valid for C++ (-fPIC is accepted now) - builds, but does not install in vendor directories - disabled tests - requires X server - temporarily removed CC and OPTIMIZE because it brakes build - BR: libstdc++-devel, qt-devel, xorg-lib-libXext-devel, xorg-lib-libXi-devel, xorg-lib-libXt-devel, zlib-devel
---- Files affected: packages/perl-Qt: perl-Qt.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/perl-Qt/perl-Qt.spec diff -u packages/perl-Qt/perl-Qt.spec:1.2 packages/perl-Qt/perl-Qt.spec:1.3 --- packages/perl-Qt/perl-Qt.spec:1.2 Fri Feb 19 09:23:42 2010 +++ packages/perl-Qt/perl-Qt.spec Fri Feb 19 21:10:36 2010 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without tests # do not perform "make test" +%bcond_with tests # do not perform "make test" # %include /usr/lib/rpm/macros.perl %define pdir PerlQt @@ -15,8 +15,14 @@ Source0: http://www.cpan.org/modules/by-module/Qt/%{pdir}-%{version}.tar.gz # Source0-md5: a0cdc0c86b3e79c56f09f2af8c4c2c39 URL: http://search.cpan.org/dist/Qt/ +BuildRequires: libstdc++-devel BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: qt-devel BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXi-devel +BuildRequires: xorg-lib-libXt-devel +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -38,38 +44,37 @@ %prep %setup -q -n %{pdir}-%{version} +%{__sed} 's/ -Wmissing-prototypes / /' -i configure %build %{__perl} Makefile.PL \ --with-qt-dir=%{_libdir} \ INSTALLDIRS=vendor -%{__make} \ - CC="%{__cc}" \ - OPTIMIZE="%{rpmcflags}" +%{__make} %{?with_tests:%{__make} test} %install rm -rf $RPM_BUILD_ROOT -%{__make} pure_install \ +%{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -cp -a examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +#install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +#cp -a examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc Changes CREDITS INSTALL README TODO -%{perl_vendorarch}/Qt/*.pm -%dir %{perl_vendorarch}/auto/Qt/ +%doc INSTALL README TODO +#%{perl_vendorarch}/Qt/*.pm +#%dir %{perl_vendorarch}/auto/Qt/ -%{_mandir}/man3/* -%{_examplesdir}/%{name}-%{version} +#%{_mandir}/man3/* +#%{_examplesdir}/%{name}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -77,9 +82,17 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/02/19 20:10:36 sparky +- remove -Wmissing-prototypes because it isn't valid for C++ (-fPIC is accepted + now) +- builds, but does not install in vendor directories +- disabled tests - requires X server +- temporarily removed CC and OPTIMIZE because it brakes build +- BR: libstdc++-devel, qt-devel, xorg-lib-libXext-devel, xorg-lib-libXi-devel, + xorg-lib-libXt-devel, zlib-devel + Revision 1.2 2010/02/19 08:23:42 ankry - 3.008, does not build Revision 1.1 2009/06/17 08:49:57 amateja - initial - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Qt/perl-Qt.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
