| 1 |
markusle 09/09/01 03:16:55 |
| 2 |
|
| 3 |
Added: bibus-1.4.3.2-install.1.patch |
| 4 |
Log: |
| 5 |
Removed hard coded python paths (fixes bug #259722). |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-text/bibus/files/bibus-1.4.3.2-install.1.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/bibus/files/bibus-1.4.3.2-install.1.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/bibus/files/bibus-1.4.3.2-install.1.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: bibus-1.4.3.2-install.1.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur bibus-1.4.3/Makefile bibus-1.4.3.new/Makefile |
| 17 |
--- bibus-1.4.3/Makefile 2009-01-08 18:00:26.000000000 -0500 |
| 18 |
+++ bibus-1.4.3.new/Makefile 2009-08-31 22:51:50.000000000 -0400 |
| 19 |
@@ -1,24 +1,25 @@ |
| 20 |
# you presumably will only have to change the three first lines below |
| 21 |
-DESTDIR = /usr/local |
| 22 |
+DESTDIR = ${D}usr |
| 23 |
python = /usr/bin/python |
| 24 |
oopath = /usr/lib/openoffice/program |
| 25 |
-ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib |
| 26 |
+ooure = /usr/lib/openoffice/basis-link/ure-link/lib |
| 27 |
oobasis = /usr/lib/openoffice/basis-link/program |
| 28 |
# |
| 29 |
prefix = $(DESTDIR) |
| 30 |
exec_prefix = $(prefix) |
| 31 |
bindir = $(exec_prefix)/bin |
| 32 |
datadir = $(prefix)/share |
| 33 |
-sysconfdir = /etc |
| 34 |
+pythondir = $(prefix)/lib/gentoo-python/site-packages |
| 35 |
+sysconfdir = ${D}etc |
| 36 |
mandir = $(prefix)/share/man |
| 37 |
man1dir = $(mandir)/man1 |
| 38 |
|
| 39 |
define install-files |
| 40 |
- install -d $(datadir)/bibus |
| 41 |
- install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/ |
| 42 |
+ install -d $(pythondir)/bibus |
| 43 |
+ install -m644 *.py MySQL_Bibus.ini $(pythondir)/bibus/ |
| 44 |
# |
| 45 |
for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data; do \ |
| 46 |
- find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \ |
| 47 |
+ find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(pythondir)/bibus/'{}' ';' ; \ |
| 48 |
done |
| 49 |
install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg |
| 50 |
# locale files. We look for all the directory in locale/ |
| 51 |
@@ -35,41 +36,38 @@ |
| 52 |
# freedesktop icon and shortcut |
| 53 |
install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png |
| 54 |
install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop |
| 55 |
- # The following lines are presumably not needed since icons/desktop are in standard locations |
| 56 |
- #echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop |
| 57 |
- #echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop |
| 58 |
|
| 59 |
# bibus command |
| 60 |
install -d $(bindir) |
| 61 |
- ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus |
| 62 |
- chmod 755 $(datadir)/bibus/bibusStart.py |
| 63 |
+ ln -sf $(pythondir)/bibus/bibusStart.py $(bindir)/bibus |
| 64 |
+ chmod 755 $(pythondir)/bibus/bibusStart.py |
| 65 |
|
| 66 |
# basic doc files |
| 67 |
- install -m755 -d $(datadir)/doc/bibus |
| 68 |
- install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus |
| 69 |
+ install -m755 -d $(datadir)/doc/${PF} |
| 70 |
+ install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/${PF} |
| 71 |
|
| 72 |
# generating bibus.cfg file |
| 73 |
- echo '[PATH]' > $(datadir)/bibus/bibus.cfg |
| 74 |
- echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg |
| 75 |
- echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg |
| 76 |
- echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg |
| 77 |
- echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg |
| 78 |
- echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg |
| 79 |
- echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg |
| 80 |
- echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg |
| 81 |
- echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg |
| 82 |
+ echo '[PATH]' > $(pythondir)/bibus/bibus.cfg |
| 83 |
+ echo 'python = $(python)' >> $(pythondir)/bibus/bibus.cfg |
| 84 |
+ echo 'oopath = $(oopath)' >> $(pythondir)/bibus/bibus.cfg |
| 85 |
+ echo 'ooure = $(ooure)' >> $(pythondir)/bibus/bibus.cfg |
| 86 |
+ echo 'oobasis = $(oobasis)' >> $(pythondir)/bibus/bibus.cfg |
| 87 |
+ echo 'docdir = /usr/share/doc/${PF}/html' >> $(pythondir)/bibus/bibus.cfg |
| 88 |
+ echo 'licence = /usr/share/doc/${PF}/copying' >> $(pythondir)/bibus/bibus.cfg |
| 89 |
+ echo 'localedir = /usr/share/locale' >> $(pythondir)/bibus/bibus.cfg |
| 90 |
+ echo 'systemconf = /etc/bibus.config' >> $(pythondir)/bibus/bibus.cfg |
| 91 |
endef |
| 92 |
|
| 93 |
define install-doc-en |
| 94 |
# copying docs in from Docs/html/en/ for bibus-doc-en |
| 95 |
cd Docs;\ |
| 96 |
- find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';' |
| 97 |
+ find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/${PF}/'{}' ';' |
| 98 |
endef |
| 99 |
|
| 100 |
define compile |
| 101 |
- # compile recursively all the python files located in $(datadir)/bibus |
| 102 |
- $(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')" |
| 103 |
- $(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')" |
| 104 |
+ # compile recursively all the python files located in $(pythondir)/bibus |
| 105 |
+ $(python) -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')" |
| 106 |
+ $(python) -O -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')" |
| 107 |
endef |
| 108 |
|
| 109 |
install-files: |
| 110 |
@@ -85,13 +83,15 @@ |
| 111 |
|
| 112 |
# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh |
| 113 |
echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh |
| 114 |
- echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 115 |
- echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 116 |
- echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh |
| 117 |
- echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh |
| 118 |
- echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh |
| 119 |
- echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 120 |
- echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh |
| 121 |
- echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh |
| 122 |
+ echo "rm -rf /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 123 |
+ echo "rm /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 124 |
+ echo "rm -rf /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 125 |
+ echo "rm /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 126 |
+ echo "find /usr/share/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh |
| 127 |
+ echo "rm /etc/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh |
| 128 |
+ echo "rm /usr/share/man/man1/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh |
| 129 |
+ echo "rm -rf /usr/share/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh |
| 130 |
+ echo "rm /usr/share/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh |
| 131 |
+ echo "rm /usr/share/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh |
| 132 |
chmod 744 $(datadir)/bibus/Setup/uninstall.sh |
| 133 |
# end uninstaller |
| 134 |
diff -Naur bibus-1.4.3/Setup/Makefile bibus-1.4.3.new/Setup/Makefile |
| 135 |
--- bibus-1.4.3/Setup/Makefile 2009-01-08 18:00:26.000000000 -0500 |
| 136 |
+++ bibus-1.4.3.new/Setup/Makefile 2009-08-31 22:52:23.000000000 -0400 |
| 137 |
@@ -1,24 +1,25 @@ |
| 138 |
# you presumably will only have to change the three first lines below |
| 139 |
-DESTDIR = /usr/local |
| 140 |
+DESTDIR = ${D}usr |
| 141 |
python = /usr/bin/python |
| 142 |
oopath = /usr/lib/openoffice/program |
| 143 |
-ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib |
| 144 |
+ooure = /usr/lib/openoffice/basis-link/ure-link/lib |
| 145 |
oobasis = /usr/lib/openoffice/basis-link/program |
| 146 |
# |
| 147 |
prefix = $(DESTDIR) |
| 148 |
exec_prefix = $(prefix) |
| 149 |
bindir = $(exec_prefix)/bin |
| 150 |
datadir = $(prefix)/share |
| 151 |
-sysconfdir = /etc |
| 152 |
+pythondir = $(prefix)/lib/gentoo-python/site-packages |
| 153 |
+sysconfdir = ${D}etc |
| 154 |
mandir = $(prefix)/share/man |
| 155 |
man1dir = $(mandir)/man1 |
| 156 |
|
| 157 |
define install-files |
| 158 |
- install -d $(datadir)/bibus |
| 159 |
- install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/ |
| 160 |
+ install -d $(pythondir)/bibus |
| 161 |
+ install -m644 *.py MySQL_Bibus.ini $(pythondir)/bibus/ |
| 162 |
# |
| 163 |
for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data; do \ |
| 164 |
- find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \ |
| 165 |
+ find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(pythondir)/bibus/'{}' ';' ; \ |
| 166 |
done |
| 167 |
install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg |
| 168 |
# locale files. We look for all the directory in locale/ |
| 169 |
@@ -35,41 +36,38 @@ |
| 170 |
# freedesktop icon and shortcut |
| 171 |
install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png |
| 172 |
install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop |
| 173 |
- # The following lines are presumably not needed since icons/desktop are in standard locations |
| 174 |
- #echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop |
| 175 |
- #echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop |
| 176 |
|
| 177 |
# bibus command |
| 178 |
install -d $(bindir) |
| 179 |
- ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus |
| 180 |
- chmod 755 $(datadir)/bibus/bibusStart.py |
| 181 |
+ ln -sf $(pythondir)/bibus/bibusStart.py $(bindir)/bibus |
| 182 |
+ chmod 755 $(pythondir)/bibus/bibusStart.py |
| 183 |
|
| 184 |
# basic doc files |
| 185 |
- install -m755 -d $(datadir)/doc/bibus |
| 186 |
- install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus |
| 187 |
+ install -m755 -d $(datadir)/doc/${PF} |
| 188 |
+ install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/${PF} |
| 189 |
|
| 190 |
# generating bibus.cfg file |
| 191 |
- echo '[PATH]' > $(datadir)/bibus/bibus.cfg |
| 192 |
- echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg |
| 193 |
- echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg |
| 194 |
- echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg |
| 195 |
- echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg |
| 196 |
- echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg |
| 197 |
- echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg |
| 198 |
- echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg |
| 199 |
- echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg |
| 200 |
+ echo '[PATH]' > $(pythondir)/bibus/bibus.cfg |
| 201 |
+ echo 'python = $(python)' >> $(pythondir)/bibus/bibus.cfg |
| 202 |
+ echo 'oopath = $(oopath)' >> $(pythondir)/bibus/bibus.cfg |
| 203 |
+ echo 'ooure = $(ooure)' >> $(pythondir)/bibus/bibus.cfg |
| 204 |
+ echo 'oobasis = $(oobasis)' >> $(pythondir)/bibus/bibus.cfg |
| 205 |
+ echo 'docdir = /usr/share/doc/${PF}/html' >> $(pythondir)/bibus/bibus.cfg |
| 206 |
+ echo 'licence = /usr/share/doc/${PF}/copying' >> $(pythondir)/bibus/bibus.cfg |
| 207 |
+ echo 'localedir = /usr/share/locale' >> $(pythondir)/bibus/bibus.cfg |
| 208 |
+ echo 'systemconf = /etc/bibus.config' >> $(pythondir)/bibus/bibus.cfg |
| 209 |
endef |
| 210 |
|
| 211 |
define install-doc-en |
| 212 |
# copying docs in from Docs/html/en/ for bibus-doc-en |
| 213 |
cd Docs;\ |
| 214 |
- find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';' |
| 215 |
+ find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/${PF}/'{}' ';' |
| 216 |
endef |
| 217 |
|
| 218 |
define compile |
| 219 |
- # compile recursively all the python files located in $(datadir)/bibus |
| 220 |
- $(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')" |
| 221 |
- $(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')" |
| 222 |
+ # compile recursively all the python files located in $(pythondir)/bibus |
| 223 |
+ $(python) -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')" |
| 224 |
+ $(python) -O -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')" |
| 225 |
endef |
| 226 |
|
| 227 |
install-files: |
| 228 |
@@ -85,13 +83,15 @@ |
| 229 |
|
| 230 |
# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh |
| 231 |
echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh |
| 232 |
- echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 233 |
- echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 234 |
- echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh |
| 235 |
- echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh |
| 236 |
- echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh |
| 237 |
- echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 238 |
- echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh |
| 239 |
- echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh |
| 240 |
+ echo "rm -rf /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 241 |
+ echo "rm /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 242 |
+ echo "rm -rf /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 243 |
+ echo "rm /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh |
| 244 |
+ echo "find /usr/share/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh |
| 245 |
+ echo "rm /etc/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh |
| 246 |
+ echo "rm /usr/share/man/man1/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh |
| 247 |
+ echo "rm -rf /usr/share/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh |
| 248 |
+ echo "rm /usr/share/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh |
| 249 |
+ echo "rm /usr/share/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh |
| 250 |
chmod 744 $(datadir)/bibus/Setup/uninstall.sh |
| 251 |
# end uninstaller |
| 252 |
diff -Naur bibus-1.4.3/Setup/bibus.cfg bibus-1.4.3.new/Setup/bibus.cfg |
| 253 |
--- bibus-1.4.3/Setup/bibus.cfg 2009-01-08 18:00:26.000000000 -0500 |
| 254 |
+++ bibus-1.4.3.new/Setup/bibus.cfg 2009-08-31 22:48:22.000000000 -0400 |
| 255 |
@@ -1,7 +1,7 @@ |
| 256 |
[PATH] |
| 257 |
python = /usr/bin/python |
| 258 |
oopath = /usr/lib/openoffice/program |
| 259 |
-docdir = /usr/local/share/doc/bibus/html |
| 260 |
-licence = /usr/local/share/doc/bibus/copying |
| 261 |
-localedir = /usr/local/share/locale |
| 262 |
-systemconf = /usr/local/etc/bibus.config |
| 263 |
+docdir = /usr/share/doc/bibus-1.4.3.2-r1/html |
| 264 |
+licence = /usr/share/doc/bibus-1.4.3.2-r1/copying |
| 265 |
+localedir = /usr/share/locale |
| 266 |
+systemconf = /etc/bibus.config |
| 267 |
diff -Naur bibus-1.4.3/Setup/bibus.sh bibus-1.4.3.new/Setup/bibus.sh |
| 268 |
--- bibus-1.4.3/Setup/bibus.sh 2009-01-08 18:00:26.000000000 -0500 |
| 269 |
+++ bibus-1.4.3.new/Setup/bibus.sh 2009-08-31 22:54:14.000000000 -0400 |
| 270 |
@@ -1,4 +1,4 @@ |
| 271 |
#!/bin/sh |
| 272 |
-export LD_LIBRARY_PATH=/usr/lib/openoffice/program |
| 273 |
-export PYTHONPATH=/usr/lib/openoffice/program |
| 274 |
-exec /usr/bin/python /usr/local/share/bibus/bibus.py |
| 275 |
+export LD_LIBRARY_PATH=/usr/lib/openoffice/program:/usr/lib/openoffice/basis-link/program:/usr/lib/openoffice/basis-link/ure-link/lib |
| 276 |
+export PYTHONPATH=/usr/lib/openoffice/program:/usr/lib/openoffice/basis-link/program:/usr/lib/openoffice/basis-link/ure-link/lib |
| 277 |
+exec /usr/bin/python /usr/lib/gentoo-python/site-packages/bibus/bibus.py |
Archives