Author: dmacvicar Date: Thu Mar 13 13:56:54 2008 New Revision: 9123 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9123&view=rev Log: more build fixes Modified: trunk/libzypp/cmake/modules/ZyppCommon.cmake trunk/libzypp/libzypp.spec.cmake Modified: trunk/libzypp/cmake/modules/ZyppCommon.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/cmake/modules/ZyppCommon.cmake?rev=9123&r1=9122&r2=9123&view=diff ============================================================================== --- trunk/libzypp/cmake/modules/ZyppCommon.cmake (original) +++ trunk/libzypp/cmake/modules/ZyppCommon.cmake Thu Mar 13 13:56:54 2008 @@ -38,11 +38,13 @@ # CONFIGURATION # #################################################################### -SET( DOC_INSTALL_DIR - "${CMAKE_INSTALL_PREFIX}/share/doc/packages/${PACKAGE}" - CACHE PATH "The install dir for documentation (default prefix/share/doc/packages/${PACKAGE})" - FORCE -) +IF( NOT DEFINED DOC_INSTALL_DIR ) + SET( DOC_INSTALL_DIR + "${CMAKE_INSTALL_PREFIX}/share/doc/packages/${PACKAGE}" + CACHE PATH "The install dir for documentation (default prefix/share/doc/packages/${PACKAGE})" + FORCE + ) +ENDIF( NOT DEFINED DOC_INSTALL_DIR ) #################################################################### # INCLUDES # @@ -143,4 +145,4 @@ COMMAND ${CMAKE_MAKE_PROGRAM} svncheck ${AUTOBUILD_COMMAND} ) -ENDMACRO(GENERATE_PACKAGING) \ No newline at end of file +ENDMACRO(GENERATE_PACKAGING) Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=9123&r1=9122&r2=9123&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Thu Mar 13 13:56:54 2008 @@ -97,6 +97,7 @@ mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ + -DDOC_INSTALL_DIR=%{_docdir} \ -DLIB=%{_lib} \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ @@ -114,7 +115,11 @@ make install DESTDIR=$RPM_BUILD_ROOT make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d + +%if 0%{?suse_version} %suse_update_desktop_file -G "" -C "" package-manager +%endif + make -C po install DESTDIR=$RPM_BUILD_ROOT # Create filelist with translations cd .. @@ -130,6 +135,7 @@ %run_ldconfig %clean +rm -rf "$RPM_BUILD_ROOT" %files -f zypp.lang %defattr(-,root,root) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org