Author: jajcus Date: Tue Apr 5 07:06:02 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- Version: 0.9.1
---- Files affected:
packages/shotwell:
shotwell-cflags.patch (1.1 -> 1.2) , shotwell.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: packages/shotwell/shotwell-cflags.patch
diff -u packages/shotwell/shotwell-cflags.patch:1.1
packages/shotwell/shotwell-cflags.patch:1.2
--- packages/shotwell/shotwell-cflags.patch:1.1 Wed Mar 23 11:17:03 2011
+++ packages/shotwell/shotwell-cflags.patch Tue Apr 5 09:05:57 2011
@@ -1,26 +1,26 @@
-diff -dur shotwell-0.9.0.orig/plugins/Makefile.plugin.mk
shotwell-0.9.0/plugins/Makefile.plugin.mk
---- shotwell-0.9.0.orig/plugins/Makefile.plugin.mk 2011-03-22
21:46:13.000000000 +0100
-+++ shotwell-0.9.0/plugins/Makefile.plugin.mk 2011-03-23 10:41:40.000000000
+0100
-@@ -32,7 +32,8 @@
+--- shotwell-0.9.1/plugins/Makefile.plugin.mk.orig 2011-04-04
19:54:27.000000000 +0200
++++ shotwell-0.9.1/plugins/Makefile.plugin.mk 2011-04-05 08:52:34.000000000
+0200
+@@ -32,8 +32,8 @@
CFILES := $(notdir $(SRC_FILES:.vala=.c))
OFILES := $(notdir $(SRC_FILES:.vala=.o))
--CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` -O2 -g -pipe -fPIC
-nostdlib \
-+CFLAGS = -O2 -g
-+PLUGIN_CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` $(CFLAGS)
-pipe -fPIC -nostdlib \
- -export-dynamic
- LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS)
+-CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` -nostdlib
-export-dynamic $(PLUGIN_CFLAGS)
+-LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS)
++LOCAL_CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` -nostdlib
-export-dynamic $(PLUGIN_CFLAGS)
++LOCAL_LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS)
DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
-@@ -52,10 +53,10 @@
+
+ all: $(PLUGIN).so
+@@ -51,10 +51,10 @@
@
$(OFILES): %.o: %.c $(CFILES)
- $(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES)
-+ $(CC) -c $(PLUGIN_CFLAGS) $(DEFINES) -I../.. $(CFILES)
++ $(CC) -c $(LOCAL_CFLAGS) $(DEFINES) -I../.. $(CFILES)
$(PLUGIN).so: $(OFILES)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OFILES) -I../.. -shared -o $@
-+ $(CC) $(PLUGIN_CFLAGS) $(LDFLAGS) $(OFILES) -I../.. -shared -o $@
++ $(CC) $(LOCAL_CFLAGS) $(LOCAL_LDFLAGS) $(OFILES) -I../.. -shared -o $@
.PHONY: cleantemps
cleantemps:
================================================================
Index: packages/shotwell/shotwell.spec
diff -u packages/shotwell/shotwell.spec:1.13
packages/shotwell/shotwell.spec:1.14
--- packages/shotwell/shotwell.spec:1.13 Thu Mar 24 11:40:42 2011
+++ packages/shotwell/shotwell.spec Tue Apr 5 09:05:57 2011
@@ -1,12 +1,12 @@
# $Revision$, $Date$
Summary: Photo manager for GNOME
Name: shotwell
-Version: 0.9.0
+Version: 0.9.1
Release: 1
License: LGPL v2+ and CC-BY-SA
Group: X11/Applications
Source0:
http://yorba.org/download/shotwell/0.9/%{name}-%{version}.tar.bz2
-# Source0-md5: 6701d9a7c0a2f4f720fdeed1d6e54758
+# Source0-md5: 1a98d1da59424a67b310cc39e8ad3368
Patch0: %{name}-cflags.patch
URL: http://yorba.org/shotwell/
BuildRequires: GConf2-devel >= 2.22.0
@@ -52,22 +52,21 @@
# this is not autoconf generated
./configure \
--prefix=%{_prefix} \
+ --lib=%{_lib} \
--disable-schemas-install \
--disable-desktop-update \
--disable-icon-update
%{__make} \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags}"
+ CFLAGS="%{rpmcflags}" \
+ PLUGIN_CFLAGS="%{rpmcflags}"
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- LIB=%{_lib}
-
-rm -r $RPM_BUILD_ROOT%{_localedir}/te_IN
+ DESTDIR=$RPM_BUILD_ROOT
%find_lang shotwell --with-gnome
@@ -108,6 +107,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2011/04/05 07:05:57 jajcus
+- Version: 0.9.1
+
Revision 1.13 2011/03/24 10:40:42 wiget
- fix building on x86_64
- BR m4 (used in Makefile) and bash (used by configure)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/shotwell/shotwell-cflags.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/shotwell/shotwell.spec?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
