packages: kde4-oxygen-icons/kde4-oxygen-icons.spec - merged from DEVEL
shadzik
shadzik at pld-linux.org
Thu Feb 18 01:19:27 CET 2010
Author: shadzik Date: Thu Feb 18 00:19:27 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
packages/kde4-oxygen-icons:
kde4-oxygen-icons.spec (1.19 -> 1.20)
---- Diffs:
================================================================
Index: packages/kde4-oxygen-icons/kde4-oxygen-icons.spec
diff -u packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.19 packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.20
--- packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.19 Thu Jan 28 22:41:28 2010
+++ packages/kde4-oxygen-icons/kde4-oxygen-icons.spec Thu Feb 18 01:19:22 2010
@@ -2,20 +2,21 @@
#
# Conditional build:
#
-%define state stable
+%define _state stable
+%define snap svn1048496
%define orgname oxygen-icons
Summary: KDE4 - Oxygen icons
Summary(pl.UTF-8): Ikony Oxygen dla KDE4
Name: kde4-oxygen-icons
-Version: 4.3.5
+Version: 4.4.0
Release: 1
License: GPL v2
Group: X11/Libraries
-Source0: ftp://ftp.kde.org/pub/kde/%{state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: d41f62ab450e06c1f375179289417e98
+Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+# Source0-md5: fbcd429cc822cb88a815d97a4e66be4d
URL: http://www.kde.org/
-BuildRequires: cmake >= 2.6.1-2
+BuildRequires: cmake >= 2.8.0
BuildRequires: rpmbuild(macros) >= 1.293
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,7 +53,6 @@
Motyw ikon do KDE - oxygen. Ten pakiet zawiera ikony SVG.
%prep
-
%setup -q -n %{orgname}-%{version}
%build
@@ -62,7 +62,7 @@
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-DCMAKE_CXX_COMPILER_WORKS=1 \
- -DCMAKE_CXX_COMPILER="%{__cc}" \
+ -DCMAKE_C_COMPILER_WORKS=1 \
%if "%{_lib}" == "lib64"
-DLIB_SUFFIX=64
%endif
@@ -83,6 +83,7 @@
%defattr(644,root,root,755)
# digikam has it's own icon in digikam.spec
%dir %{_iconsdir}/oxygen/256x256
+%dir %{_iconsdir}/oxygen/256x256/actions
%dir %{_iconsdir}/oxygen/256x256/apps
%dir %{_iconsdir}/oxygen/256x256/categories
%dir %{_iconsdir}/oxygen/256x256/devices
@@ -130,60 +131,56 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.19 2010/01/28 21:41:28 shadzik
-- 4.3.5
+Revision 1.20 2010/02/18 00:19:22 shadzik
+- merged from DEVEL
+
+Revision 1.8.2.16 2010/02/04 19:52:39 arekm
+- up to 4.4.0
+
+Revision 1.8.2.15 2010/02/03 10:32:09 shadzik
+- unify _state macro (do not use "state")
+
+Revision 1.8.2.14 2010/02/02 13:13:20 shadzik
+- force cmake 2.8.0 BR
+
+Revision 1.8.2.13 2010/01/31 23:35:25 shadzik
+- 4.4 RC3
+
+Revision 1.8.2.12 2010/01/20 08:30:05 arekm
+- up to 4.3.95
-Revision 1.18 2009/12/03 01:08:26 sparky
-- trick cmake not to require unneeded c++ compiler
+Revision 1.8.2.11 2010/01/08 04:51:43 shadzik
+- 4.4 RC1
-Revision 1.17 2009/11/30 10:04:08 shadzik
+Revision 1.8.2.10 2009/12/20 13:45:23 shadzik
+- 4.4 Beta2
+
+Revision 1.8.2.9 2009/12/03 15:39:29 shadzik
+- %dir
+
+Revision 1.8.2.8 2009/12/03 02:28:51 shadzik
+- 4.4 beta1
+
+Revision 1.8.2.7 2009/11/30 10:38:09 shadzik
- trick cmake not to check for working compilers, as we don't need compilers at all to make this package
-Revision 1.16 2009/11/30 09:26:39 shadzik
-- no no, definitely no libstdc++-devel BR
-- # ldd /usr/bin/cmake |grep libstdc++
- libstdc++.so.6 => /usr/lib64/libstdc++.so.6 (0x00007f4fa4697000)
-- # rpm -qf /usr/lib64/libstdc++.so.6
-libstdc++-4.4.2-5.x86_64
-
-Revision 1.15 2009/11/30 09:19:01 shadzik
-- ok, cmake sucks
-
-Revision 1.14 2009/11/30 08:43:54 shadzik
-- reverted obvious bullshit
-- [shadzik at moana oxygen-icons-4.3.4]$ rpm -q libstdc++-devel
-package libstdc++-devel is not installed
-[shadzik at moana oxygen-icons-4.3.4]$ mkdir build
-[shadzik at moana oxygen-icons-4.3.4]$ cd build/
-[shadzik at moana build]$ cmake ../
--- The C compiler identification is GNU
--- The CXX compiler identification is GNU
--- Check for working C compiler: /usr/bin/gcc
--- Check for working C compiler: /usr/bin/gcc -- works
--- Detecting C compiler ABI info
--- Detecting C compiler ABI info - done
--- Check for working CXX compiler: /usr/bin/c++
--- Check for working CXX compiler: /usr/bin/c++ -- works
--- Detecting CXX compiler ABI info
--- Detecting CXX compiler ABI info - done
--- Configuring done
--- Generating done
--- Build files have been written to: /home/users/shadzik/rpm/BUILD/oxygen-icons-4.3.4/build
-
-Revision 1.13 2009/11/30 01:06:59 sparky
-- BR: libstdc++-devel
-
-Revision 1.12 2009/11/28 17:48:47 shadzik
-- 4.3.4
+Revision 1.8.2.6 2009/11/17 02:25:37 shadzik
+- 4.3.75
+
+Revision 1.8.2.5 2009/10/28 22:49:06 shadzik
+- 4.3.73
+
+Revision 1.8.2.4 2009/10/18 12:48:48 paszczus
+- updated to 4.3.72
-Revision 1.11 2009/10/31 13:13:21 shadzik
-- 4.3.3
+Revision 1.8.2.3 2009/10/02 13:24:33 cactus
+- up to 4.3.69
-Revision 1.10 2009/10/02 17:59:35 shadzik
-- 4.3.2 try #1
+Revision 1.8.2.2 2009/09/22 12:18:47 cactus
+- up to 4.3.68
-Revision 1.9 2009/08/28 14:22:46 shadzik
-- 4.3.1
+Revision 1.8.2.1 2009/08/25 13:24:11 paszczus
+- updated to 4.3.65
Revision 1.8 2009/08/03 15:20:29 arekm
- values are case sensitive it seems
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-oxygen-icons/kde4-oxygen-icons.spec?r1=1.19&r2=1.20&f=u
More information about the pld-cvs-commit
mailing list