- include the Vala vapi file

- outdated patch removed

Changed files:
    gexiv2-libtool.patch -> 1.2
    gexiv2.spec -> 1.5

diff --git a/gexiv2-libtool.patch b/gexiv2-libtool.patch
deleted file mode 100644 (file)
index c3af6e2..0000000
--- a/gexiv2-libtool.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile~  2010-06-28 13:00:02.000000000 -0600
-+++ Makefile   2010-08-02 13:12:28.000000000 -0600
-@@ -134,7 +134,7 @@
- .PHONY: install
- install:
-       @mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)
--      libtool --mode=install $(INSTALL_PROGRAM) $(LIBRARY).la $(DESTDIR)$(PREFIX)/$(LIB)
-+      libtool --tag=CC --mode=install $(INSTALL_PROGRAM) $(LIBRARY).la $(DESTDIR)$(PREFIX)/$(LIB)
-       @mkdir -p $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
-       $(INSTALL_DATA) $(EXPANDED_INSTALLED_HEADER_FILES) $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
-       @mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
-@@ -147,7 +147,7 @@
-       $(INSTALL_DATA) $(VAPI_FILE) $(DESTDIR)$(PREFIX)/share/vala/vapi
- 
- uninstall:
--      libtool --mode=uninstall rm -f $(DESTDIR)$(PREFIX)/$(LIB)/$(LIBRARY).la
-+      libtool --tag=CC --mode=uninstall rm -f $(DESTDIR)$(PREFIX)/$(LIB)/$(LIBRARY).la
-       rm -rf $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
-       rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PKGNAME).pc
-       rm -f $(DESTDIR)$(PREFIX)/share/vala/vapi/$(PKGNAME).vapi
-@@ -163,8 +163,8 @@
- $(EXPANDED_OBJ_FILES): $(BUILD_DIR)/%.o: gexiv2/%.cpp $(EXPANDED_HEADER_FILES) $(CONFIG_IN) Makefile
-       @pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS)'
-       @mkdir -p $(BUILD_DIR)
--      libtool --mode=compile $(CXX) -c $(EXT_PKGS_CFLAGS) $(CFLAGS) -I. -o $@ $<
-+      libtool --tag=CC --mode=compile $(CXX) -c $(EXT_PKGS_CFLAGS) $(CFLAGS) -I. -o $@ $<
- 
- $(LIBRARY_BIN): $(EXPANDED_OBJ_FILES)
--      libtool --mode=link $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY_BIN)
-+      libtool --tag=CC --mode=link $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY_BIN)
- 

diff --git a/gexiv2.spec b/gexiv2.spec
index 07de31016b1909688a3ee7357916a0ce0ce52efd..887fe9c1d355eb50445b114f695fdd149b6fa44b 100644 (file)
--- a/gexiv2.spec
+++ b/gexiv2.spec
@@ -10,7 +10,6 @@ Group:                Applications/Graphics
 Source0:       http://yorba.org/download/gexiv2/0.2/lib%{name}-%{version}.tar.bz2
 # Source0-md5: 2bdedaa705260a1f36ae335a5a426f6a
 URL:           http://trac.yorba.org/wiki/gexiv2
-Patch0:                %{name}-libtool.patch
 BuildRequires: exiv2-devel >= 0.19
 BuildRequires: pkgconfig
 Requires:      exiv2-libs >= 0.19
@@ -40,7 +39,6 @@ gexiv2 static library
 
 %prep
 %setup -q -n lib%{name}-%{version}
-#%patch0 -p0
 
 %build
 %{__libtoolize}
@@ -68,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib%{name}.la
 %{_includedir}/%{name}
 %{_pkgconfigdir}/%{name}.pc
+/usr/share/vala/vapi/gexiv2.vapi
 
 %files static
 %defattr(644,root,root,755)