Author: dmacvicar Date: Wed Nov 28 21:56:10 2007 New Revision: 42483 URL: http://svn.opensuse.org/viewcvs/yast?rev=42483&view=rev Log: make the spec file look like a spec file, not tested Modified: branches/tmp/coolo/qt4-port/CMakeLists.txt branches/tmp/coolo/qt4-port/yast2-qt4.spec.in Modified: branches/tmp/coolo/qt4-port/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/CMakeLists.txt?rev=42483&r1=42482&r2=42483&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/CMakeLists.txt Wed Nov 28 21:56:10 2007 @@ -4,7 +4,7 @@ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual" ) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall" ) -SET( PACKAGE "yast2-qt4" ) +SET( RPMNAME "yast2-qt4" ) FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Yast REQUIRED) Modified: branches/tmp/coolo/qt4-port/yast2-qt4.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/yast2-qt4.spec.in?rev=42483&r1=42482&r2=42483&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/yast2-qt4.spec.in (original) +++ branches/tmp/coolo/qt4-port/yast2-qt4.spec.in Wed Nov 28 21:56:10 2007 @@ -19,16 +19,26 @@ %description - -@PREP@ +%build +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ + -DLIB=%{_lib} \ + -DCMAKE_C_FLAGS="%{optflags}" \ + -DCMAKE_CXX_FLAGS="%{optflags}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + .. +make %{?jobs:-j %jobs} + +%install +cd build +make install DESTDIR=$RPM_BUILD_ROOT +cd .. -@BUILD-QT@ +%clean +rm -rf "$RPM_BUILD_ROOT" -@INSTALL@ -rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2qt4.la -rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2qt4_pkg.la - - -@CLEAN@ %if 0%{?suse_version} <= 1010 %define _xorg7fonts /usr/X11R6/lib/X11/fonts @@ -38,15 +48,15 @@ %files %defattr (-, root, root) -@plugindir@/libpy2qt4.so.* -@plugindir@/libpy2qt4.so -@plugindir@/libpy2qt4_pkg.so.* -@plugindir@/libpy2qt4_pkg.so -@imagedir@ +@YAST_PLUGIN_DIR@/libpy2qt4.so.* +@YAST_PLUGIN_DIR@/libpy2qt4.so +@YAST_PLUGIN_DIR@/libpy2qt4_pkg.so.* +@YAST_PLUGIN_DIR@/libpy2qt4_pkg.so +@YAST_IMAGE_DIR@ %dir %{_xorg7fonts}/uni %verify(not md5 size mtime) %{_xorg7fonts}/uni/fonts.dir %{_xorg7fonts}/uni/newunifont.pcf.gz %{_xorg7fonts}/uni/unifont.pcf.gz -%dir @ydatadir@ -@ydatadir@/lang_fonts -%doc @docdir@ +%dir @YAST_DATA_DIR@ +@YAST_DATA_DIR@/lang_fonts +%doc %{prefix}/share/doc/packages/%{name} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org