Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre

4 files changed, 23 insertions, 42 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index a0d3f1497..29e055afe 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libretools
 pkgver=$(date -u +%Y%m%d)
-pkgrel=1.1
+pkgrel=1
 pkgdesc="Scripts for easing Parabola's tasks"
 arch=('any')
 url="http://parabolagnulinux.org"
@@ -35,6 +35,7 @@ build() {
 
 package() {
   install -d ${pkgdir}/usr/bin
+  install -d ${pkgdir}/usr/sbin
   install -d ${pkgdir}/etc
 
   install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
@@ -47,7 +48,6 @@ package() {
   install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
@@ -56,5 +56,7 @@ package() {
   install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
   install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
+
+  install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/
   
 } 
\ No newline at end of file
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 2657f5208..8eea37689 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -2,25 +2,8 @@
 # arg 1:  the new package version
 post_install() {
   cat <<EOF
-
-For using libremakepkg /etc/libretools.conf to fit your needs.
-
-For the scripts that can be run as normal user you can make
-custom configuration by copying /etc/libretools.conf to
-\$XDG_CONFIG_HOME/libretools/libretools.conf
-     
-You should add this to your ~/.ssh/config file:
-
-# Parabola Host
-Host parabola
-   Port 22
-   HostName repo.parabolagnulinux.org
-   User parabolavnx
-   IdentityFile ~/.ssh/id_rsa
-# End Parabola Host
-
-Edit IdentityFile as needed.
-
+Please check http://wiki.parabolagnulinux.org/hacking:packagers
+and follow instructions there before using libretools.
 EOF
 }
 
@@ -30,6 +13,7 @@ post_upgrade() {
   cat <<EOF
 Check your /etc/libretools.conf
 
+Make sure LIBREDESTDIR finish with "repo" instead of "free"
 EOF
 }
 
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index eacbfdbb4..dcab9e342 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 pkgname=unarchiver
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686')
 url="http://wakaba.c3.cx/s/apps/unarchiver.html"
@@ -12,18 +12,20 @@ source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip
 md5sums=('c6aed2fcb2b68d86a9d9d4fc39c4ea41')
 replaces=('unrar')
 conflicts=('unrar')
+provides=('unrar')
 
 build() {
   cd "$srcdir/The Unarchiver/XADMaster"
 
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  make -f Makefile.linux
+  make -f Makefile.linux unar lsar
 }
 
 package() {
   cd "$srcdir/The Unarchiver/XADMaster"
   install -d "$pkgdir/usr/bin/"
-  cp unar lsar "$pkgdir/usr/bin/"
+  install -m755 unar ${pkgdir}/usr/bin
+  install -m755 lsar ${pkgdir}/usr/bin
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 26df281b6..83f9070fc 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
 pkgname=your-freedom
-pkgver=$(LC_ALL=C date +%Y%m%d)
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
 pkgrel=1
 pkgdesc="This package conflicts with every unfree package known to date."
 arch=('any')
@@ -8,25 +8,18 @@ url="http://parabolagnulinux.org"
 license=('GPL')
 groups=('base')
 install=${pkgname}.install
-source=(http://repo.parabolagnulinux.org/docs/blacklist.txt
-        http://repo.parabolagnulinux.org/docs/whitelist.txt)
+source=()
+md5sums=()
 noextract=()
-md5sums=() #generate with 'makepkg -g'
-
-get_blacklist() {
-    unfree=($(wget -q -O - ${source[0]} | \
-        cut -d':' -f1,2 | \
-        sed "s/:$//" | \
-        grep -v ":" | \
-        sort -u))
-    echo "conflicts=(${unfree[@]})"
-}
 
 build() {
-    install -d $pkgdir/usr/share/doc/${pkgname}
-    install -m644 $srcdir/{black,white}list.txt
+    cd ${srcdir}
+    wget http://repo.parabolagnulinux.org/docs/blacklist.txt
+    wget http://repo.parabolagnulinux.org/docs/whitelist.txt
+    install -d ${pkgdir}/usr/share/doc/${pkgname}
+    install -m644 {black,white}list.txt ${pkgdir}/usr/share/doc/${pkgname}/
 }
 
-md5sums=('2637ca96bd9e39dacd452bec01307345'
-         '98d40d324ed474a9b2a222432fb97f02')
-conflicts=(abyssws aqua-data-studio arch-artwork arch-firefox-search archlinux-artwork archlinux-menus archlinux-themes-kde archlinux-themes-kdm archlinux-themes-slim archlinux-wallpaper arch-wiki-docs b43-fwcutter bass blobwars boinc boinc-nox chromium-bsu crafty d4x dina-font dosemu faac firefox-i18n firefox-spell-pt-br firefox-spell-ru flashplugin fmodex font-mathematica foomatic-db-nonfree gstreamer0.10-bad ipw2100-fw ipw2200-fw iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode java-sun jdk jre kernel26-firmware lha lib32-libflashsupport lib32-nvidia-utils libflashsupport linux-firmware mac martian martian-utils mesa-demos mod_fastcgi monaco-linux-font ndiswrapper ndiswrapper-utils netperf nouveau-firmware nvidia nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils nvidia-cg-toolkit nvidia-lts nvidia-utils nxclient openttd-opensfx opera povray profont pypy qingy-theme-arch qstat rt2870usb-fw rt2x00-rt61-fw rt2x00-rt71w-fw sdlmame sfarkxtc skype skype-oss skype-staticqt slim-themes snes9x sopcast sqlite3-doc tarsnap ttf-hannom ttf-ms-fonts urbanterror urbanterror-data vbaexpress virtualbox-additions virtualbox-additions-modules visualboyadvance warsow-data xdm-archlinux xf86-input-vmmouse xf86-video-vmware xorg-xlsfonts xpdf-chinese-simplified xpdf-chinese-traditional xpdf-japanese xpdf-korean xsnow xv zd1211-firmware)
+package() {
+    conflicts=($(cut -d: -f1 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt))
+}