Author: adgor                        Date: Mon Jul  4 19:20:48 2005 GMT
Module: SPECS                         Tag: qt-copy
---- Log message:
- 050704 qt-copy snap

---- Files affected:
SPECS:
   qt4.spec (1.30 -> 1.30.2.1) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.30 SPECS/qt4.spec:1.30.2.1
--- SPECS/qt4.spec:1.30 Mon Jul  4 00:24:34 2005
+++ SPECS/qt4.spec      Mon Jul  4 21:20:43 2005
@@ -19,6 +19,8 @@
 %bcond_without ibase           # build ibase (InterBase/Firebird) plugin
 %bcond_without pch             # enable pch in qmake
 %bcond_with    dont_enable     # blocks translations, they are not yet 
available
+%bcond_without demos           # do not build & install demos
+%bcond_without examples        # do not build & install examples
 
 %undefine      with_dont_enable
 
@@ -28,20 +30,20 @@
 %define                _withsql        1
 
%{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine
 _withsql}}}}}}
 
-%define                _packager       djurban
+%define                _ver            4.0.0
+%define                _snap           050704
 
 Summary:       The Qt GUI application framework
 Summary(es):   Biblioteca para ejecutar aplicaciones GUI Qt
 Summary(pl):   Biblioteka Qt do tworzenia GUI
 Summary(pt_BR):        Estrutura para rodar aplicaçőes GUI Qt
 Name:          qt4
-Version:       4.0.0
-#Release:      1.%{_snap}.0.1
-Release:       0.2
+Version:       %{_ver}.%{_snap}
+Release:       1
 License:       GPL/QPL
 Group:         X11/Libraries
-Source0:       
ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-desktop-%{version}.tar.bz2
-# Source0-md5: a6183269fab293282daf2da9ac940577
+Source0:       http://ftp.pld-linux.org/software/kde/qt-copy-%{version}.tar.bz2
+##% Source0-md5:       20ad0c23d8c78889565efbd934e52c96
 Source2:       qtconfig.desktop
 Source3:       designer.desktop
 Source4:       assistant.desktop
@@ -595,8 +597,7 @@
 Programas exemplo para o Qt versăo.
 
 %prep
-#setup -q -n %{_name}-copy-%{_snap}
-%setup -q -n qt-x11-opensource-desktop-%{version}
+%setup -q -n qt-copy-%{version}
 %patch0 -p1
 %if %{with dont_enable}
 %patch1 -p1
@@ -614,7 +615,7 @@
 #0043
 #0047
 #EOF
-#./apply_patches
+./apply_patches
 
 # change QMAKE_CFLAGS_RELEASE to build
 # properly optimized libs
@@ -748,8 +749,8 @@
 
 %{__make} \
        sub-tools-all-ordered \
-       sub-demos-all-ordered \
-       sub-examples-all-ordered
+       %{?with_demos:sub-demos-all-ordered} \
+       %{?with_examples:sub-examples-all-ordered}
 
 #
 # TODO: 
@@ -782,9 +783,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-QTDIR=`/bin/pwd`
-
-export QTDIR
+export QTDIR=`/bin/pwd`
 
 %{__make} install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
@@ -854,9 +853,8 @@
 ln -sf ../../QtCore/arch/qatomic.h arch/qatomic.h
 cd -
 
-for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
-do
-       sed -i -e 
s:-L$RPM_BUILD_DIR/qt-x11-opensource-desktop-%{version}/lib::g $f
+for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do
+       sed -i -e s:-L`pwd`/lib::g $f
 done
 
 # Prepare some files list
@@ -903,13 +901,16 @@
 mkdevfl Qt3Support
 mkdevfl QtDesigner || /bin/true # there is no libQtDesigner.la file :/
 
+%if %{with examples}
 echo "%defattr(644,root,root,755)" > examples.files
 ifecho examples %{_examplesdir}/qt4
 for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4 -printf "%%P "`
 do
        ifecho examples %{_examplesdir}/qt4/$f
 done
+%endif
 
+%if %{with demos}
 echo "%defattr(644,root,root,755)" > demos.files
 ifecho demos "%{_examplesdir}/qt4-demos"
 ifecho demos "%{_bindir}/qtdemo" >> demos.files
@@ -917,6 +918,7 @@
 do
        ifecho demos %{_examplesdir}/qt4-demos/$f
 done
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1112,8 +1114,8 @@
 %files -n QtXml-devel -f QtXml-devel.files
 %files -n Qt3Support-devel -f Qt3Support-devel.files
 
-%files demos -f demos.files
-%files examples -f examples.files
+%{?with_demos:%files demos -f demos.files}
+%{?with_examples:%files examples -f examples.files}
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1121,6 +1123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30.2.1  2005/07/04 19:20:43  adgor
+- 050704 qt-copy snap
+
 Revision 1.30  2005/07/03 22:24:34  pascalek
 - Release 0.2; QtDesigner-devel package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.30&r2=1.30.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to