[paketler-commits] r65162 - in 2009/devel/hardware/library/libgphoto2: . files

paketler-commits at pardus.org.tr paketler-commits at pardus.org.tr
27 Nis 2009 Pzt 15:59:37 EEST


Author: ozan.caglayan
Date: Mon Apr 27 15:59:36 2009
New Revision: 65162

Added:
   2009/devel/hardware/library/libgphoto2/files/gphoto2-ixany.patch
   2009/devel/hardware/library/libgphoto2/files/gphoto2-pkgcfg.patch
   2009/devel/hardware/library/libgphoto2/files/gphoto2-storage.patch
Removed:
   2009/devel/hardware/library/libgphoto2/files/60_udev_rules_are_autogenerated_notice.patch
Modified:
   2009/devel/hardware/library/libgphoto2/actions.py
   2009/devel/hardware/library/libgphoto2/pspec.xml
Log:
Version bump, generate and install hal fdi file.

Modified: 2009/devel/hardware/library/libgphoto2/actions.py
=================================================================
--- 2009/devel/hardware/library/libgphoto2/actions.py	(original)
+++ 2009/devel/hardware/library/libgphoto2/actions.py	Mon Apr 27 15:59:36 2009
@@ -1,19 +1,23 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2005-2008 TUBITAK/UEKAE
+# Copyright 2005-2009 TUBITAK/UEKAE
 # Licensed under the GNU General Public License, version 2.
 # See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
+import os
+
 def setup():
+    autotools.autoreconf("-fi")
     autotools.configure("--with-rpmbuild=/bin/false \
                          --with-drivers=all \
-                         --with-exif-prefix=/usr \
+                         --without-aalib \
+                         --disable-rpath \
                          --enable-nls \
                          --disable-static")
 
@@ -22,13 +26,23 @@
 
 def install():
     autotools.rawInstall("DESTDIR=%s \
-                         gphotodocdir=/usr/share/doc/%s \
-                         HTML_DIR=/usr/share/doc/%s/sgml \
-                         hotplugdocdir=/usr/share/doc/%s/linux-hotplug \
-                         udevscriptdir=/lib/udev"
-                         % (get.installDIR(), get.srcTAG(), get.srcTAG(), get.srcTAG()))
+                          udevscriptdir=/lib/udev" % get.installDIR())
 
-    pisitools.removeDir("/usr/share/doc/libgphoto2")
-    pisitools.removeDir("/usr/share/doc/libgphoto2_port")
+    HAL_FDI="usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
+    UDEV_RULES="/lib/udev/rules.d/70-libgphoto2.rules"
+    CAM_LIST="usr/lib/libgphoto2/print-camera-list"
+    CAM_LIBS="usr/lib/libgphoto2/%s" % get.srcVERSION()
+
+    # Create hal directory
+    pisitools.dodir(shelltools.dirName(HAL_FDI))
+
+    # Generate HAL FDI file
+    shelltools.export("CAMLIBS", "%s/%s" % (get.installDIR(), CAM_LIBS))
+    shelltools.export("LIBDIR", "%s/usr/lib/" % get.installDIR())
+    shelltools.export("LD_LIBRARY_PATH", "%s/usr/lib/" % get.installDIR())
+
+    f = open(os.path.join(get.installDIR(), HAL_FDI), "w")
+    f.write(os.popen("%s/%s hal-fdi" % (get.installDIR(), CAM_LIST)).read())
+    f.close()
 
-    pisitools.dodoc("ChangeLog", "NEWS*", "README", "AUTHORS", "TESTERS", "MAINTAINERS", "HACKING", "CHANGES")
+    pisitools.dodoc("ChangeLog", "NEWS*", "README", "AUTHORS", "TESTERS", "MAINTAINERS", "HACKING")

Modified: 2009/devel/hardware/library/libgphoto2/pspec.xml
=================================================================
--- 2009/devel/hardware/library/libgphoto2/pspec.xml	(original)
+++ 2009/devel/hardware/library/libgphoto2/pspec.xml	Mon Apr 27 15:59:36 2009
@@ -5,36 +5,35 @@
         <Name>libgphoto2</Name>
         <Homepage>http://www.gphoto.org/</Homepage>
         <Packager>
-            <Name>Pardus</Name>
-            <Email>admins at pardus.org.tr</Email>
+            <Name>Ozan Çağlayan</Name>
+            <Email>ozan at pardus.org.tr</Email>
         </Packager>
         <License>GPLv2</License>
         <IsA>library</IsA>
         <Summary>Library that implements support for numerous digital cameras</Summary>
-        <Description>Libgphoto2 is the core library designed to allow access to digital camera by external programs.</Description>
-        <Archive sha1sum="bde7a9e78e4342878f11b493b53eca5b69107de9" type="tarbz2">mirrors://sourceforge/gphoto/libgphoto2-2.4.2.tar.bz2</Archive>
+        <Description>libgphoto2 is the core library designed to allow access to digital camera by external programs.</Description>
+        <Archive sha1sum="b1f51f0587afbe454db411f9005bd6ce5138156b" type="tarbz2">mirrors://sourceforge/gphoto/libgphoto2-2.4.5.tar.bz2</Archive>
         <BuildDependencies>
-            <Dependency versionFrom="0.1.12">libusb</Dependency>
-            <Dependency versionFrom="0.11">usbutils</Dependency>
-            <Dependency versionFrom="0.6.13">libexif</Dependency>
-            <Dependency versionFrom="1.0">dbus</Dependency>
-            <Dependency releaseFrom="6">avahi</Dependency>
+            <Dependency>libexif</Dependency>
+            <Dependency>avahi</Dependency>
             <Dependency>hal</Dependency>
         </BuildDependencies>
         <Patches>
+            <Patch>libgphoto2-2.4.0-norpm.patch</Patch>
             <Patch level="1">10_disable_cache.patch</Patch>
-            <Patch level="1">60_udev_rules_are_autogenerated_notice.patch</Patch>
             <Patch level="1">70_increase_max_entries.patch</Patch>
-            <Patch>libgphoto2-2.4.0-norpm.patch</Patch>
+            <Patch level="1">gphoto2-pkgcfg.patch</Patch>
+            <Patch level="1">gphoto2-storage.patch</Patch>
+            <Patch level="1">gphoto2-ixany.patch</Patch>
+
         </Patches>
     </Source>
 
     <Package>
         <Name>libgphoto2</Name>
         <RuntimeDependencies>
-            <Dependency versionFrom="0.6.13">libexif</Dependency>
-            <Dependency versionFrom="1.0">dbus</Dependency>
-            <Dependency releaseFrom="6">avahi</Dependency>
+            <Dependency>libexif</Dependency>
+            <Dependency>avahi</Dependency>
             <Dependency>hal</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -44,6 +43,8 @@
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="data">/usr/share/libgphoto2</Path>
+            <Path fileType="data">/usr/lib/pkgconfig</Path>
+            <Path fileType="data">/usr/share/hal/fdi</Path>
             <Path fileType="localedata">/usr/share/locale</Path>
             <Path fileType="man">/usr/share/man</Path>
         </Files>
@@ -53,6 +54,13 @@
     </Package>
 
     <History>
+        <Update release="24">
+            <Date>2009-04-27</Date>
+            <Version>2.4.5</Version>
+            <Comment>Version bump, generate and install hal fdi file.</Comment>
+            <Name>Ozan Çağlayan</Name>
+            <Email>ozan at pardus.org.tr</Email>
+        </Update>
         <Update release="23">
             <Date>2008-08-27</Date>
             <Version>2.4.2</Version>


Paketler-commits mesaj listesiyle ilgili daha fazla bilgi