diff options
| author | Robert Xu <robxu9@gmail.com> | 2012-02-26 12:50:04 -0500 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2012-02-26 12:50:04 -0500 |
| commit | 481b46fdd0e36396cbbf2308dfce83df10b979df (patch) | |
| tree | 16071d4a4e45db15c7080e2c0f8bedee90bc28a9 /opensuse/core/tde-filesystem | |
| parent | 5d7b5e6defb05f81691d286d40f67260c4733d00 (diff) | |
| download | tde-packaging-481b46fdd0e36396cbbf2308dfce83df10b979df.tar.gz tde-packaging-481b46fdd0e36396cbbf2308dfce83df10b979df.zip | |
Push working tdelibs (rpmlint errors don't count)
Diffstat (limited to 'opensuse/core/tde-filesystem')
| -rw-r--r-- | opensuse/core/tde-filesystem/.project | 12 | ||||
| -rw-r--r-- | opensuse/core/tde-filesystem/macros.tde | 37 | ||||
| -rw-r--r-- | opensuse/core/tde-filesystem/tde-filesystem.spec | 4 |
3 files changed, 36 insertions, 17 deletions
diff --git a/opensuse/core/tde-filesystem/.project b/opensuse/core/tde-filesystem/.project deleted file mode 100644 index f5ebb3417..000000000 --- a/opensuse/core/tde-filesystem/.project +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>tde-filesystem</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - <nature>org.eclipse.linuxtools.rpm.core.rpmnature</nature> - </natures> -</projectDescription> diff --git a/opensuse/core/tde-filesystem/macros.tde b/opensuse/core/tde-filesystem/macros.tde index 20998b9b9..cfb1219d2 100644 --- a/opensuse/core/tde-filesystem/macros.tde +++ b/opensuse/core/tde-filesystem/macros.tde @@ -40,11 +40,42 @@ %_tde_modules %{_tde_modulesdir} %_tde_servicetypes %{_tde_servicetypesdir} -%_tde_platform_version 3.5.13 +%_tde_platform_version R13.99 -%tde_runtime_requires Requires: tdebase3-runtime >= %_tde_platform_version qt3 >= 3.3.8d +%tde_runtime_requires Requires: tdebase3-runtime >= %_tde_platform_version qt3 >= 3.4.0 %_tde_build_type release + +%cmake_tdeusr(d:) \ + export CFLAGS=$RPM_OPT_FLAGS \ + export CXXFLAGS=$RPM_OPT_FLAGS \ + export LDFLAGS="-Wl,-Bsymbolic-functions $LDFLAGS" \ + _tde_libsuffix=$(echo %_lib | cut -b4-) \ + bdir=. \ + %{-d:dir=%{-d*} \ + mkdir $dir \ + cd $dir \ + bdir=.. } \ + cmake -DCMAKE_SKIP_RPATH=ON \\\ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ + -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir} \\\ + -DLIB_SUFFIX="$_tde_libsuffix" \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ + -DCMAKE_BUILD_TYPE=%{_tde_build_type} \\\ + -DCMAKE_VERBOSE_MAKEFILE=ON \\\ + -DQT_LIBRARY_DIRS=/usr/lib/qt3/%{_lib} \\\ + -DQT_INCLUDE_DIRS=/usr/lib/qt3/include \\\ + -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \\\ + -DMAN_INSTALL_DIR=%{_mandir} \\\ + -DINFO_INSTALL_DIR=%{_infodir} \\\ + $bdir %* \ + if [ "$bdir" == ".." ]; then \ + cd .. \ + fi \ +%{nil} %cmake_tde(d:) \ export CFLAGS=$RPM_OPT_FLAGS \ @@ -128,7 +159,7 @@ if test -f $HOME/.rpmmacros && test -d /usr/src/packages/SRPMS; then \ distribution=`grep ^%distribution $HOME/.rpmmacros | cut '-d ' -f2` \ fi \ - find $RPM_BUILD_ROOT/opt/kde3/share \\\ + find $RPM_BUILD_ROOT/%{_tde_sharedir} \\\ -name '*.desktop' 2> /dev/null | while read file; do \ test -r "$file" || continue \ grep -q "^X-SuSE-translate=" "$file" && continue \ diff --git a/opensuse/core/tde-filesystem/tde-filesystem.spec b/opensuse/core/tde-filesystem/tde-filesystem.spec index 06fa6b5fe..32b61b75e 100644 --- a/opensuse/core/tde-filesystem/tde-filesystem.spec +++ b/opensuse/core/tde-filesystem/tde-filesystem.spec @@ -20,7 +20,7 @@ Name: tde-filesystem Url: http://www.trinitydesktop.org/ -Version: 3.5.13 +Version: R13.99 Release: 1 License: LGPLv2.1+ Group: System/Fhs @@ -47,7 +47,7 @@ Authors: %install install -D -m644 %{SOURCE0} $RPM_BUILD_ROOT/etc/rpm/macros.tde - install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT//usr/share/doc/packages/tde-filesystem/COPYING + install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/doc/packages/tde-filesystem/COPYING %clean rm -rf "$RPM_BUILD_ROOT" |