rpms/pragha/devel pragha-0.8.0.1-de.po.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 pragha.spec, 1.2, 1.3 sources, 1.3, 1.4
by Christoph Wickert
Author: cwickert
Update of /cvs/free/rpms/pragha/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16038/devel
Modified Files:
.cvsignore pragha.spec sources
Added Files:
pragha-0.8.0.1-de.po.patch
Log Message:
* Fri Jul 30 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.8.0.1-1
- Update to 0.8.0.1
- Add COPYING and NEWS to docs
pragha-0.8.0.1-de.po.patch:
de.po | 226 ++++++++++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 152 insertions(+), 74 deletions(-)
--- NEW FILE pragha-0.8.0.1-de.po.patch ---
--- pragha-0.8.0.1.orig/po/de.po 2010-07-30 02:23:14.000000000 +0200
+++ pragha-0.8.0.1/po/de.po 2010-07-30 12:17:11.000000000 +0200
@@ -3,8 +3,8 @@
"Project-Id-Version: Pragha svn rev. 60\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-07-29 21:23-0300\n"
-"PO-Revision-Date: 2010-07-14 13:21-0300\n"
-"Last-Translator: Matias <mati86dl(a)gmail.com>\n"
+"PO-Revision-Date: 2010-07-30 11:26+0100\n"
+"Last-Translator: Christoph Wickert <cwickert(a)fedoraproject.org>\n"
"Language-Team: Deutsch\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -34,7 +34,8 @@
msgid "_Help"
msgstr "_Hilfe"
-#: src/gui.c:164 src/gui.c:309
+#: src/gui.c:164
+#: src/gui.c:309
msgid "_Add files"
msgstr "Dateien _hinzufügen"
@@ -42,7 +43,8 @@
msgid "Open a media file"
msgstr "Eine Mediendatei öffnen"
-#: src/gui.c:166 src/gui.c:311
+#: src/gui.c:166
+#: src/gui.c:311
msgid "_Play audio CD"
msgstr "Audio-_CD abspielen"
@@ -50,11 +52,13 @@
msgid "Prev track"
msgstr "Vorheriger Titel"
-#: src/gui.c:170 src/gui.c:315
+#: src/gui.c:170
+#: src/gui.c:315
msgid "Play / Pause"
msgstr "Wiedergabe/Pause"
-#: src/gui.c:172 src/gui.c:317
+#: src/gui.c:172
+#: src/gui.c:317
msgid "Stop"
msgstr "Stopp"
@@ -62,11 +66,13 @@
msgid "Next track"
msgstr "Nächster Titel"
-#: src/gui.c:176 src/gui.c:321
+#: src/gui.c:176
+#: src/gui.c:321
msgid "_Properties"
msgstr "_Eigenschaften"
-#: src/gui.c:178 src/gui.c:323
+#: src/gui.c:178
+#: src/gui.c:323
msgid "_Quit"
msgstr "_Beenden"
@@ -74,23 +80,29 @@
msgid "_Add the library"
msgstr "Zur Musikbibliothek _hinzufügen"
-#: src/gui.c:182 src/gui.c:243
+#: src/gui.c:182
+#: src/gui.c:243
msgid "Remove"
msgstr "Entfernen"
-#: src/gui.c:184 src/gui.c:245
+#: src/gui.c:184
+#: src/gui.c:245
msgid "Crop"
msgstr "Zuschneiden"
-#: src/gui.c:186 src/gui.c:255
+#: src/gui.c:186
+#: src/gui.c:255
msgid "Clear playlist"
msgstr "Wiedergabeliste löschen"
-#: src/gui.c:188 src/gui.c:251
+#: src/gui.c:188
+#: src/gui.c:251
msgid "Save selection"
msgstr "Auswahl speichern"
-#: src/gui.c:190 src/gui.c:253 src/current_playlist.c:638
+#: src/gui.c:190
+#: src/gui.c:253
+#: src/current_playlist.c:638
msgid "Save playlist"
msgstr "Wiedergabeliste speichern"
@@ -126,7 +138,8 @@
msgid "_Statistics"
msgstr "Statistiken"
-#: src/gui.c:207 src/gui.c:307
+#: src/gui.c:207
+#: src/gui.c:307
msgid "About"
msgstr "_Über"
@@ -154,11 +167,15 @@
msgid "_Fullscreen"
msgstr "_Vollbild"
-#: src/gui.c:227 src/gui.c:588 src/pref.c:1352
+#: src/gui.c:227
+#: src/gui.c:588
+#: src/pref.c:1352
msgid "Library"
msgstr "Musikbibliothek"
-#: src/gui.c:230 src/gui.c:606 src/playlist.c:897
+#: src/gui.c:230
+#: src/gui.c:606
+#: src/playlist.c:897
msgid "Playlists"
msgstr "Wiedergabelisten"
@@ -175,7 +192,9 @@
msgstr "Aus der Warteliste entfernen"
#. The main edit dialog
-#: src/gui.c:247 src/gui.c:275 src/tags.c:656
+#: src/gui.c:247
+#: src/gui.c:275
+#: src/tags.c:656
msgid "Edit tags"
msgstr "Tags bearbeiten"
@@ -183,11 +202,13 @@
msgid "Properties"
msgstr "Eigenschaften"
-#: src/gui.c:260 src/gui.c:271
+#: src/gui.c:260
+#: src/gui.c:271
msgid "_Add to playlist"
msgstr "Zur Wiedergabeliste _hinzufügen"
-#: src/gui.c:262 src/gui.c:273
+#: src/gui.c:262
+#: src/gui.c:273
msgid "_Replace playlist"
msgstr "Wiedergabeliste ersetzen"
@@ -217,38 +238,59 @@
#: src/gui.c:288
msgid "Folder structure"
-msgstr ""
+msgstr "Verzeichnisbaum"
-#: src/gui.c:290 src/gui.c:726 src/gui.c:857 src/current_playlist.c:1307
-#: src/current_playlist.c:1433 src/librarytree.c:1261 src/statusicon.c:135
-#: src/statusicon.c:193 src/tags.c:441
+#: src/gui.c:290
+#: src/gui.c:726
+#: src/gui.c:857
+#: src/current_playlist.c:1307
+#: src/current_playlist.c:1433
+#: src/librarytree.c:1261
+#: src/statusicon.c:135
+#: src/statusicon.c:193
+#: src/tags.c:441
msgid "Artist"
msgstr "Interpret"
-#: src/gui.c:292 src/gui.c:727 src/gui.c:858 src/current_playlist.c:1308
-#: src/current_playlist.c:1434 src/librarytree.c:1265 src/statusicon.c:136
-#: src/statusicon.c:194 src/tags.c:442
+#: src/gui.c:292
+#: src/gui.c:727
+#: src/gui.c:858
+#: src/current_playlist.c:1308
+#: src/current_playlist.c:1434
+#: src/librarytree.c:1265
+#: src/statusicon.c:136
+#: src/statusicon.c:194
+#: src/tags.c:442
msgid "Album"
msgstr "Album"
-#: src/gui.c:294 src/gui.c:728 src/gui.c:859 src/current_playlist.c:1309
-#: src/current_playlist.c:1435 src/librarytree.c:1269 src/tags.c:443
+#: src/gui.c:294
+#: src/gui.c:728
+#: src/gui.c:859
+#: src/current_playlist.c:1309
+#: src/current_playlist.c:1435
+#: src/librarytree.c:1269
+#: src/tags.c:443
msgid "Genre"
msgstr "Genre"
-#: src/gui.c:296 src/librarytree.c:1273
+#: src/gui.c:296
+#: src/librarytree.c:1273
msgid "Artist / Album"
msgstr "Interpret / Album"
-#: src/gui.c:298 src/librarytree.c:1281
+#: src/gui.c:298
+#: src/librarytree.c:1281
msgid "Genre / Album"
msgstr "Genre / Album"
-#: src/gui.c:300 src/librarytree.c:1277
+#: src/gui.c:300
+#: src/librarytree.c:1277
msgid "Genre / Artist"
msgstr "Genre / Interpret"
-#: src/gui.c:302 src/librarytree.c:1285
+#: src/gui.c:302
+#: src/librarytree.c:1285
msgid "Genre / Artist / Album"
msgstr "Genre / Interpret / Album"
@@ -256,7 +298,9 @@
msgid "Prev Track"
msgstr "Vorheriger Titel"
-#: src/gui.c:319 src/gui.c:1569 src/statusicon.c:160
+#: src/gui.c:319
+#: src/gui.c:1569
+#: src/statusicon.c:160
msgid "Next Track"
msgstr "Nächster Titel"
@@ -266,39 +310,59 @@
msgstr "Pragha Music Manager"
#. Create the checkmenu items
-#: src/gui.c:724 src/gui.c:855 src/current_playlist.c:70
+#: src/gui.c:724
+#: src/gui.c:855
+#: src/current_playlist.c:70
msgid "Track"
msgstr "Spur"
#. Create labels
-#: src/gui.c:725 src/gui.c:856 src/current_playlist.c:1306
-#: src/current_playlist.c:1432 src/statusicon.c:134 src/statusicon.c:192
+#: src/gui.c:725
+#: src/gui.c:856
+#: src/current_playlist.c:1306
+#: src/current_playlist.c:1432
+#: src/statusicon.c:134
+#: src/statusicon.c:192
#: src/tags.c:440
msgid "Title"
msgstr "Titel"
-#: src/gui.c:729 src/gui.c:860 src/current_playlist.c:1313
+#: src/gui.c:729
+#: src/gui.c:860
+#: src/current_playlist.c:1313
#: src/current_playlist.c:1439
msgid "Bitrate"
msgstr "Bitrate"
-#: src/gui.c:730 src/gui.c:861 src/current_playlist.c:1310
-#: src/current_playlist.c:1436 src/tags.c:445
+#: src/gui.c:730
+#: src/gui.c:861
+#: src/current_playlist.c:1310
+#: src/current_playlist.c:1436
+#: src/tags.c:445
msgid "Year"
msgstr "Jahr"
-#: src/gui.c:731 src/gui.c:862 src/current_playlist.c:1311
-#: src/current_playlist.c:1437 src/tags.c:446
+#: src/gui.c:731
+#: src/gui.c:862
+#: src/current_playlist.c:1311
+#: src/current_playlist.c:1437
+#: src/tags.c:446
#, fuzzy
msgid "Comment"
msgstr "Gemeinschaft"
-#: src/gui.c:732 src/gui.c:863 src/current_playlist.c:1312
-#: src/current_playlist.c:1438 src/statusicon.c:137 src/statusicon.c:195
+#: src/gui.c:732
+#: src/gui.c:863
+#: src/current_playlist.c:1312
+#: src/current_playlist.c:1438
+#: src/statusicon.c:137
+#: src/statusicon.c:195
msgid "Length"
msgstr "Länge"
-#: src/gui.c:733 src/gui.c:864 src/current_playlist.c:1316
+#: src/gui.c:733
+#: src/gui.c:864
+#: src/current_playlist.c:1316
#: src/current_playlist.c:1442
msgid "Filename"
msgstr "Dateiname"
@@ -332,7 +396,9 @@
msgid "Repeat playback list at the end"
msgstr "Wiedergabe wiederholen"
-#: src/gui.c:1614 src/panel.c:218 src/statusicon.c:189
+#: src/gui.c:1614
+#: src/panel.c:218
+#: src/statusicon.c:189
msgid "<b>Not playing</b>"
msgstr "<b>Keine Wiedergabe</b>"
@@ -342,12 +408,8 @@
#: src/panel.c:194
#, c-format
-msgid ""
-"%s <small><span weight=\"light\">by</span></small> %s <small><span weight="
-"\"light\">in</span></small> %s"
-msgstr ""
-"%s <small><span weight=\"light\">von</span></small> %s <small><span weight="
-"\"light\">in</span></small> %s"
+msgid "%s <small><span weight=\"light\">by</span></small> %s <small><span weight=\"light\">in</span></small> %s"
+msgstr "%s <small><span weight=\"light\">von</span></small> %s <small><span weight=\"light\">in</span></small> %s"
#: src/panel.c:199
#, c-format
@@ -375,27 +437,37 @@
msgid "<b>con_playlist</b> is a reserved playlist name"
msgstr "<b>con_playlist</b> ist ein reservierter Wiedergabelistenname"
-#: src/current_playlist.c:1305 src/current_playlist.c:1431 src/tags.c:444
+#: src/current_playlist.c:1305
+#: src/current_playlist.c:1431
+#: src/tags.c:444
msgid "Track No"
msgstr "Titelnummer"
-#: src/current_playlist.c:1314 src/current_playlist.c:1440
+#: src/current_playlist.c:1314
+#: src/current_playlist.c:1440
msgid "Channels"
msgstr "Kanäle"
-#: src/current_playlist.c:1315 src/current_playlist.c:1441
+#: src/current_playlist.c:1315
+#: src/current_playlist.c:1441
msgid "Samplerate"
msgstr "Samplerate"
-#: src/current_playlist.c:1337 src/current_playlist.c:1339
-#: src/current_playlist.c:1341 src/current_playlist.c:1343
-#: src/current_playlist.c:1346 src/current_playlist.c:1455
-#: src/current_playlist.c:1457 src/current_playlist.c:1459
-#: src/current_playlist.c:1461 src/current_playlist.c:1464
+#: src/current_playlist.c:1337
+#: src/current_playlist.c:1339
+#: src/current_playlist.c:1341
+#: src/current_playlist.c:1343
+#: src/current_playlist.c:1346
+#: src/current_playlist.c:1455
+#: src/current_playlist.c:1457
+#: src/current_playlist.c:1459
+#: src/current_playlist.c:1461
+#: src/current_playlist.c:1464
msgid "Unknown Tags"
msgstr "Unbekannte Tags"
-#: src/current_playlist.c:1353 src/current_playlist.c:1470
+#: src/current_playlist.c:1353
+#: src/current_playlist.c:1470
msgid "Track Information"
msgstr "Titelinformationen"
@@ -419,8 +491,7 @@
msgstr ""
"Die Datei sicher aus der Musikbibliothek entfernen?\n"
"\n"
-"Warnung: Um die Datei wiederherzustellen, muss die gesamte Musikbibliothek "
-"neu eingelesen werden."
+"Warnung: Um die Datei wiederherzustellen, muss die gesamte Musikbibliothek neu eingelesen werden."
#: src/librarytree.c:1083
msgid ""
@@ -434,7 +505,7 @@
#: src/librarytree.c:1258
msgid "Folders structure"
-msgstr ""
+msgstr "Verzeichnisbaum"
#: src/pref.c:21
msgid ""
@@ -450,15 +521,18 @@
msgid "Album art pattern"
msgstr "Muster für Album-Cover"
-#: src/pref.c:61 src/pref.c:1451
+#: src/pref.c:61
+#: src/pref.c:1451
msgid "Start normal"
msgstr "Normal starten"
-#: src/pref.c:66 src/pref.c:1452
+#: src/pref.c:66
+#: src/pref.c:1452
msgid "Start fullscreen"
msgstr "Vollbild starten"
-#: src/pref.c:71 src/pref.c:1453
+#: src/pref.c:71
+#: src/pref.c:1453
msgid "Start in system tray"
msgstr "Im Tray starten"
@@ -468,7 +542,8 @@
msgstr "Den zu hinzufügenden Ordner wählen"
#. The main preferences dialog
-#: src/pref.c:1304 src/pref.c:1337
+#: src/pref.c:1304
+#: src/pref.c:1337
msgid "Preferences"
msgstr "Einstellungen"
@@ -513,16 +588,14 @@
#. General Check_buttons
#: src/pref.c:1472
-#, fuzzy
msgid "Minimize Pragha when close the window"
-msgstr "Pragha minimieren, wenn das Fenster geschlossen wird"
+msgstr "Pragha beim Schließen des Fensters minimieren"
#: src/pref.c:1473
msgid "Restore last playlist"
msgstr "Letzte Wiedergabeliste wiederherstellen"
#: src/pref.c:1474
-#, fuzzy
msgid "Add files recurcively"
msgstr "Dateien rekursiv hinzufügen"
@@ -535,7 +608,9 @@
msgid "Use software mixer"
msgstr "Software-Mixer verwenden"
-#: src/pref.c:1523 src/pref.c:1529 src/pref.c:1558
+#: src/pref.c:1523
+#: src/pref.c:1529
+#: src/pref.c:1558
msgid "Restart Required"
msgstr "Neustart erforderlich"
@@ -558,7 +633,7 @@
#: src/pref.c:1666
msgid "Merge folders in the folders estructure view"
-msgstr ""
+msgstr "Ordner im Verzeichnisbaum zusammenführen"
#. Last.fm
#: src/pref.c:1684
@@ -597,7 +672,8 @@
msgid "All files"
msgstr "Alle Dateien"
-#: src/menu.c:588 src/menu.c:722
+#: src/menu.c:588
+#: src/menu.c:722
msgid "Library scan complete"
msgstr "Einlesen der Musikbibliothek abgeschlossen"
@@ -619,7 +695,9 @@
#: src/menu.c:826
msgid "translator-credits"
-msgstr "Übersetzer"
+msgstr ""
+"PhotonX\n"
+"Christoph Wickert <cwickert(a)fedoraproject.org>"
#: src/utils.c:222
msgid "days"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pragha/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 29 Jul 2010 21:52:37 -0000 1.3
+++ .cvsignore 30 Jul 2010 10:36:04 -0000 1.4
@@ -1 +1 @@
-pragha-0.8.0.tar.bz2
+pragha-0.8.0.1.tar.bz2
Index: pragha.spec
===================================================================
RCS file: /cvs/free/rpms/pragha/devel/pragha.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pragha.spec 29 Jul 2010 21:52:37 -0000 1.2
+++ pragha.spec 30 Jul 2010 10:36:04 -0000 1.3
@@ -1,5 +1,5 @@
Name: pragha
-Version: 0.8.0
+Version: 0.8.0.1
Release: 1%{?dist}
Summary: Lightweight GTK+ music manager
@@ -7,6 +7,7 @@
License: GPLv3+
URL: http://pragha.wikispaces.com/
Source0: http://dissonance.googlecode.com/files/%{name}-%{version}.tar.bz2
+Patch0: pragha-0.8.0.1-de.po.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= 1.0.15
@@ -37,6 +38,7 @@
%prep
%setup -q
+%patch0 -p1 -b .old
# Fix spurious executable permissions
chmod 0644 ChangeLog src/*.{c,h}
@@ -47,10 +49,11 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
desktop-file-install \
--delete-original \
- --remove-category=Application \
+ --remove-category=AudioVideo \
+ --add-category=Audio \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
@@ -81,7 +84,7 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
# FIXME add AUTHORS and README if not empty
-%doc ChangeLog FAQ
+%doc ChangeLog COPYING FAQ NEWS
%{_bindir}/pragha
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
@@ -91,6 +94,10 @@
%changelog
+* Fri Jul 30 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.8.0.1-1
+- Update to 0.8.0.1
+- Add COPYING and NEWS to docs
+
* Thu Jul 29 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.8.0-1
- Update to 0.8.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pragha/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 29 Jul 2010 21:52:37 -0000 1.3
+++ sources 30 Jul 2010 10:36:04 -0000 1.4
@@ -1 +1 @@
-510aeb0ce25b4c73d33c4de5ab6aed01 pragha-0.8.0.tar.bz2
+55d37c18b6aec6acad0887859dda730b pragha-0.8.0.1.tar.bz2
13 years, 8 months
rpms/pragha/devel .cvsignore, 1.2, 1.3 pragha.spec, 1.1, 1.2 sources, 1.2, 1.3
by Christoph Wickert
Author: cwickert
Update of /cvs/free/rpms/pragha/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6716
Modified Files:
.cvsignore pragha.spec sources
Log Message:
* Thu Jul 29 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.8.0-1
- Update to 0.8.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pragha/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jul 2010 22:34:24 -0000 1.2
+++ .cvsignore 29 Jul 2010 21:52:37 -0000 1.3
@@ -1 +1 @@
-pragha-0.7.7.1.tar.bz2
+pragha-0.8.0.tar.bz2
Index: pragha.spec
===================================================================
RCS file: /cvs/free/rpms/pragha/devel/pragha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pragha.spec 19 Jul 2010 22:34:24 -0000 1.1
+++ pragha.spec 29 Jul 2010 21:52:37 -0000 1.2
@@ -1,5 +1,5 @@
Name: pragha
-Version: 0.7.7.1
+Version: 0.8.0
Release: 1%{?dist}
Summary: Lightweight GTK+ music manager
@@ -91,6 +91,9 @@
%changelog
+* Thu Jul 29 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0
+
* Fri Jun 25 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.7.1-1
- Update to 0.7.7.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pragha/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jul 2010 22:34:24 -0000 1.2
+++ sources 29 Jul 2010 21:52:37 -0000 1.3
@@ -1 +1 @@
-73d5fdd6d2eb5434cff0087d29e6e630 pragha-0.7.7.1.tar.bz2
+510aeb0ce25b4c73d33c4de5ab6aed01 pragha-0.8.0.tar.bz2
13 years, 8 months
rpms/mame/F-12 .cvsignore, 1.9, 1.10 mame.spec, 1.10, 1.11 sources, 1.9, 1.10
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30883
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Thu Jul 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.139
- Updated to 0.139
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 Jul 2010 19:07:43 -0000 1.9
+++ .cvsignore 29 Jul 2010 19:57:42 -0000 1.10
@@ -1,5 +1 @@
-mame0138s.exe
-0138u1_diff.zip
-0138u2_diff.zip
-0138u3_diff.zip
-0138u4_diff.zip
+mame0139s.exe
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-12/mame.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mame.spec 22 Jul 2010 19:07:43 -0000 1.10
+++ mame.spec 29 Jul 2010 19:57:42 -0000 1.11
@@ -1,8 +1,8 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global baseversion 138
-%global sourceupdate 4
+%global baseversion 139
+#global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -232,6 +232,9 @@
%changelog
+* Thu Jul 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.139
+- Updated to 0.139
+
* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
- Updated to 0.138u4
- Install the new manpages
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Jul 2010 19:07:43 -0000 1.9
+++ sources 29 Jul 2010 19:57:42 -0000 1.10
@@ -1,5 +1 @@
-438b8469518218babfc570606d4b103a mame0138s.exe
-5e6ffa6b1e7016b21984aef654faa04a 0138u1_diff.zip
-5889117cc4a665ac0c25bb4a5c0580f9 0138u2_diff.zip
-b132cf0a572412c9d3af2b568a78dca4 0138u3_diff.zip
-ffd7ebfdff9cedcc8ec4b39ca2cfd422 0138u4_diff.zip
+51903a6ee402c8cbc25c2c3f12b77597 mame0139s.exe
13 years, 8 months
rpms/mame/F-13 .cvsignore, 1.9, 1.10 mame.spec, 1.9, 1.10 sources, 1.9, 1.10
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30779
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Thu Jul 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.139
- Updated to 0.139
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 Jul 2010 19:07:34 -0000 1.9
+++ .cvsignore 29 Jul 2010 19:57:34 -0000 1.10
@@ -1,5 +1 @@
-mame0138s.exe
-0138u1_diff.zip
-0138u2_diff.zip
-0138u3_diff.zip
-0138u4_diff.zip
+mame0139s.exe
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/mame.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mame.spec 22 Jul 2010 19:07:34 -0000 1.9
+++ mame.spec 29 Jul 2010 19:57:34 -0000 1.10
@@ -1,8 +1,8 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global baseversion 138
-%global sourceupdate 4
+%global baseversion 139
+#global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -232,6 +232,9 @@
%changelog
+* Thu Jul 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.139
+- Updated to 0.139
+
* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
- Updated to 0.138u4
- Install the new manpages
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Jul 2010 19:07:34 -0000 1.9
+++ sources 29 Jul 2010 19:57:34 -0000 1.10
@@ -1,5 +1 @@
-438b8469518218babfc570606d4b103a mame0138s.exe
-5e6ffa6b1e7016b21984aef654faa04a 0138u1_diff.zip
-5889117cc4a665ac0c25bb4a5c0580f9 0138u2_diff.zip
-b132cf0a572412c9d3af2b568a78dca4 0138u3_diff.zip
-ffd7ebfdff9cedcc8ec4b39ca2cfd422 0138u4_diff.zip
+51903a6ee402c8cbc25c2c3f12b77597 mame0139s.exe
13 years, 8 months
rpms/mame/devel .cvsignore, 1.10, 1.11 mame.spec, 1.12, 1.13 sources, 1.10, 1.11
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30673
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Thu Jul 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.139
- Updated to 0.139
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 22 Jul 2010 19:07:24 -0000 1.10
+++ .cvsignore 29 Jul 2010 19:57:25 -0000 1.11
@@ -1,5 +1 @@
-mame0138s.exe
-0138u1_diff.zip
-0138u2_diff.zip
-0138u3_diff.zip
-0138u4_diff.zip
+mame0139s.exe
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mame.spec 22 Jul 2010 19:07:24 -0000 1.12
+++ mame.spec 29 Jul 2010 19:57:25 -0000 1.13
@@ -1,8 +1,8 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global baseversion 138
-%global sourceupdate 4
+%global baseversion 139
+#global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -232,6 +232,9 @@
%changelog
+* Thu Jul 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.139
+- Updated to 0.139
+
* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
- Updated to 0.138u4
- Install the new manpages
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 22 Jul 2010 19:07:24 -0000 1.10
+++ sources 29 Jul 2010 19:57:25 -0000 1.11
@@ -1,5 +1 @@
-438b8469518218babfc570606d4b103a mame0138s.exe
-5e6ffa6b1e7016b21984aef654faa04a 0138u1_diff.zip
-5889117cc4a665ac0c25bb4a5c0580f9 0138u2_diff.zip
-b132cf0a572412c9d3af2b568a78dca4 0138u3_diff.zip
-ffd7ebfdff9cedcc8ec4b39ca2cfd422 0138u4_diff.zip
+51903a6ee402c8cbc25c2c3f12b77597 mame0139s.exe
13 years, 8 months
rpms/openafs/F-12 openafs.spec,1.2,1.3 sources,1.3,1.4
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14111
Modified Files:
openafs.spec sources
Log Message:
* Thu Jul 29 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-4
- port forward to 1.4.12.1
- backport bugfixes and enhancements from F-13 branch, including:
- RPMFusion Bug #1333 - aklog can't find configuration
- RPMFusion Bug #1047 - Fix SELinux contexts on /afs
- RPMFusion Bug #1275 - service openafs status now sets the exit code
- RPMFusion Bug #1274 - OpenAFS wont start without an IP address
- RPMFusion Bug #1277 - Include OpenAFS man pages
- Avoid using the rpm configure macro and call configure directly
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-12/openafs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openafs.spec 15 Mar 2010 21:39:40 -0000 1.2
+++ openafs.spec 29 Jul 2010 18:35:54 -0000 1.3
@@ -12,16 +12,17 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.4.12
-Release: 1%{?dist}
+Version: 1.4.12.1
+Release: 4%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}-src.tar.bz2
-Source1: CellServDB
-Source2: cacheinfo
-Source3: openafs.init
-Source4: afs.conf
+Source0: http://www.openafs.org/dl/openafs/1.4.12/%{name}-%{version}-src.tar.bz2
+Source1 http://www.openafs.org/dl/openafs/1.4.12}/openafs-%{version}-doc.tar.bz2
+Source11: CellServDB
+Source12: cacheinfo
+Source13: openafs.init
+Source14: afs.conf
BuildRoot: %{_tmppath}/%{name}-root
BuildRequires: krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison
@@ -86,7 +87,7 @@
Cell.
%prep
-%setup -q -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
@@ -100,10 +101,17 @@
./regen.sh
# build the user-space bits for base architectures
- %configure \
+ ./configure \
+ --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --bindir=%{_bindir} \
+ --sbindir=%{_sbindir} \
+ --sysconfdir=%{_sysconfdir} \
+ --localstatedir=%{_var} \
--with-afs-sysname=%{sysname} \
--with-linux-kernel-headers=%{ksource_dir} \
--disable-kernel-module \
+ --disable-strip-binaries \
--with-krb5-conf=/usr/kerberos/bin/krb5-config
# Build is not SMP compliant
@@ -119,17 +127,17 @@
# install config info
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
-install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
-install -p -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
+install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
+install -p -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
echo %{thiscell} > ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs/ThisCell
# install the init script
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
+install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
# sysconfig file
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
# Include the vlclient binary
install -m 755 src/vlserver/vlclient ${RPM_BUILD_ROOT}/usr/sbin/vlclient
@@ -152,6 +160,21 @@
rm -f ${RPM_BUILD_ROOT}/usr/bin/dlog
rm -f ${RPM_BUILD_ROOT}/usr/bin/dpass
+# Install man pages
+tar cf - -C doc/man-pages man1 man5 man8 | \
+ tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+
+# remove unused man pages
+for x in afs_ftpd afs_inetd afs_login afs_rcp afs_rlogind afs_rsh \
+ dkload knfs package runntp symlink symlink_list symlink_make \
+ symlink_remove; do
+ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${x}.1
+done
+
+# rename man page kpasswd to kapasswd
+mv $RPM_BUILD_ROOT%{_mandir}/man1/kpasswd.1 \
+ $RPM_BUILD_ROOT%{_mandir}/man1/kapasswd.1
+
# don't restart in %post because kernel modules could well have changed
%post
/sbin/ldconfig
@@ -163,6 +186,7 @@
# if this is owned by the package, upgrades with afs running can't work
if [ ! -d /afs ] ; then
mkdir -m 700 /afs
+ [ -x /sbin/restorecon ] && /sbin/restorecon /afs
fi
exit 0
@@ -218,6 +242,9 @@
%{_libdir}/libafsrpc.so.*
%{_libdir}/libafssetpag.so.*
/%{_lib}/security/*.so
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
%files client
%defattr(-, root, root)
@@ -271,6 +298,16 @@
%changelog
+* Thu Jul 29 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-4
+- port forward to 1.4.12.1
+- backport bugfixes and enhancements from F-13 branch, including:
+- RPMFusion Bug #1333 - aklog can't find configuration
+- RPMFusion Bug #1047 - Fix SELinux contexts on /afs
+- RPMFusion Bug #1275 - service openafs status now sets the exit code
+- RPMFusion Bug #1274 - OpenAFS wont start without an IP address
+- RPMFusion Bug #1277 - Include OpenAFS man pages
+- Avoid using the rpm configure macro and call configure directly
+
* Mon Mar 15 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12-1
- Update to OpenAFS 1.4.12
- OpenAFS has moved compile_et to afs_compile_et so that it
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 15 Mar 2010 21:39:40 -0000 1.3
+++ sources 29 Jul 2010 18:35:55 -0000 1.4
@@ -1 +1,2 @@
-da23ef382ae95e1de1b3eda7e6696b53 openafs-1.4.12-src.tar.bz2
+23041583f982796da3965979537a4ef1 openafs-1.4.12.1-doc.tar.bz2
+c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
13 years, 8 months
rpms/openafs-kmod/F-12 openafs-kmod.spec,1.24,1.25 sources,1.3,1.4
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12988
Modified Files:
openafs-kmod.spec sources
Log Message:
* Thu Jul 29 2010 Jack Neely <jjneely(a)ncsu.edu> - 0:1.4.12.1-1
- Bump to 1.4.12.1
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-12/openafs-kmod.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openafs-kmod.spec 27 Jul 2010 07:48:12 -0000 1.24
+++ openafs-kmod.spec 29 Jul 2010 18:23:22 -0000 1.25
@@ -22,15 +22,15 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.4.12
-Release: 1%{?dist}.10
+Version: 1.4.12.1
+Release: 1%{?dist}.0
Summary: Kernel module(s)
Group: System Environment/Kernel
License: IBM
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}-src....
+Source0: http://www.openafs.org/dl/openafs/1.4.12/%{kmod_name}-%{version}-src.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -102,6 +102,9 @@
%changelog
+* Thu Jul 29 2010 Jack Neely <jjneely(a)ncsu.edu> - 0:1.4.12.1-1
+- Bump to 1.4.12.1
+
* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.12-1.10
- rebuild for new kernel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 15 Mar 2010 21:42:02 -0000 1.3
+++ sources 29 Jul 2010 18:23:22 -0000 1.4
@@ -1 +1 @@
-da23ef382ae95e1de1b3eda7e6696b53 openafs-1.4.12-src.tar.bz2
+c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
13 years, 8 months
rpms/xbmc/devel xbmc.spec,1.4,1.5
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27950
Modified Files:
xbmc.spec
Log Message:
Fix changelog
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xbmc.spec 29 Jul 2010 06:36:33 -0000 1.4
+++ xbmc.spec 29 Jul 2010 06:38:44 -0000 1.5
@@ -193,7 +193,7 @@
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
-* Thu Jul 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.5.20100728svn32266%
+* Thu Jul 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.5.20100728svn32266
- Add gettext-devel to BuildRequires for autopoint
* Wed Jul 28 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.4.20100728svn32266
13 years, 8 months
rpms/xbmc/devel xbmc.spec,1.3,1.4
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27865
Modified Files:
xbmc.spec
Log Message:
Add gettext-devel to BuildRequires for autopoint
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xbmc.spec 22 May 2010 03:20:58 -0000 1.3
+++ xbmc.spec 29 Jul 2010 06:36:33 -0000 1.4
@@ -1,9 +1,12 @@
+%global SVNVERSION 32266
+%global DIRVERSION %{version}-%{SVNVERSION}
+
Name: xbmc
-Version: 9.11
-Release: 19%{?dist}
+Version: 10.5
+Release: 0.5.20100728svn%{SVNVERSION}%{?dist}
URL: http://www.xbmc.org/
-Source0: %{name}-%{version}-patched.tar.xz
+Source0: %{name}-%{DIRVERSION}-patched.tar.xz
# xbmc contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
# we use this script to remove the code before shipping it.
@@ -14,60 +17,31 @@
# where <version> is the particular version being used
Source1: xbmc-generate-tarball-xz.sh
-# look for libdca, rather than libdts
-# http://xbmc.org/trac/ticket/8040
-Patch1: xbmc-9.11-libdca.patch
-
-# Needs work before being submitted upstream
-Patch2: xbmc-9.11-b1-dvdlibs-external.patch
-
-# http://xbmc.org/trac/ticket/8026 (this will be in next release)
-Patch3: xbmc-9.11-use_cdio_system_headers_on_non_win32.patch
-
-# Next 3 patches to use %{_libdir}
-# http://xbmc.org/trac/ticket/8590
-Patch4: xbmc-9.11-fix-Makefile.in.patch
-Patch5: xbmc-9.11-Makefile.include.in.diff
-Patch6: xbmc-9.11-xbmc.sh.diff
-
-# Next 2 patches submitted upstream
-# http://www.xbmc.org/trac/ticket/8629
-Patch7: xbmc-9.11-spyce.diff
-Patch8: xbmc-9.11-RandomNumberGenerators.hpp.diff
-
-# Needs work before being submitted upstream
-Patch9: xbmc-9.11-remlibass.patch
-
-# Fixes GCC warning: partial backport to 9.11
-# (should be fixed in next release)
-Patch10: xbmc-9.11-changeset-26191.diff
-
-# remove goahead completely from compilation, it's been replaced
-# by libmicrohttpd in SVN, so should add that BuildRequires for 10.5
-# and drop this patch
-Patch11: xbmc-9.11-remove-goahead.patch
-
-# Next 12 patches submitted upstream:
-# http://www.xbmc.org/trac/ticket/8629
-Patch12: xbmc-9.11-external-zlib.diff
-Patch13: xbmc-9.11-goom-missing.diff
-Patch14: xbmc-9.11-rsxs-0.9.diff
-Patch15: xbmc-9.11-Weather.diff
-Patch16: xbmc-9.11-XBMCProjectM-cmake.diff
-Patch17: xbmc-9.11-cflags.patch
-Patch18: xbmc-9.11-configure.patch
-Patch19: xbmc-9.11-gymcodec.patch
-Patch20: xbmc-9.11-macdll.patch
-Patch21: xbmc-9.11-maclib.patch
-Patch22: xbmc-9.11-libid3tag.patch
-Patch23: xbmc-9.11-librtv.patch
-
-# these next 2 are (hopefully temporary) hacks
-Patch24: xbmc-9.11-swscale.diff
-Patch25: xbmc-9.11-xext.diff
-
-# an attempt to force hdhomerun to be external
-Patch26: xbmc-9.11-hdhomerun.patch
+# new patches for bootstrap
+# no trac ticket filed as yet
+Patch1: xbmc-10-bootstrap.patch
+
+# filed ticket, but patch still needs work
+# http://trac.xbmc.org/ticket/9658
+Patch2: xbmc-10-dvdread.patch
+
+# and new problem with zlib in cximage
+# trac ticket filed: http://trac.xbmc.org/ticket/9659
+# but patch not attached because it needs work
+Patch3: xbmc-10-disable-zlib-in-cximage.patch
+
+# grrr, why if an external library is detected does it require that the
+# directory exist in the tarball?
+# need to file trac ticket
+Patch4: xbmc-10-remove-libmodplug-libmicrohttpd.patch
+
+# need to file trac ticket, this patch just forces external hdhomerun
+# functionality, needs to be able fallback internal version
+Patch5: xbmc-10-hdhomerun.patch
+
+# fix "@#" in Makefile which seem to screw things up no trac filed
+# yet, don't know why this isn't a problem on other Linux systems
+Patch6: xbmc-10-Makefile.patch
ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
@@ -138,11 +112,11 @@
BuildRequires: libdca-devel
BuildRequires: libass-devel >= 0.9.7
BuildRequires: hdhomerun-devel
-# add following BR in next release of XBMC to get support for crystalhd devices
BuildRequires: libcrystalhd-devel
BuildRequires: libmodplug-devel
BuildRequires: libmicrohttpd-devel
BuildRequires: expat-devel
+BuildRequires: gettext-devel
%description
XBMC media center is a free cross-platform media-player jukebox and
@@ -152,34 +126,14 @@
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{DIRVERSION}
-%patch1 -p1 -b .dtsdca
-%patch2 -p1 -b .dvdlibs
-%patch3 -p1 -b .cdio
-%patch4 -p0 -b .makefilein
-%patch5 -p1 -b .makefileincl
-%patch6 -p1 -b .xbmcsh
-%patch7 -p1
-%patch8 -p1 -b .rand
-%patch9 -p1 -b .remlibass
-%patch10 -p1 -b .gccwarning
-%patch11 -p0 -b .removegoahead
-%patch12 -p1 -b .zlib
-%patch13 -p1 -b .goom
-%patch14 -p1 -b .rsxs
-%patch15 -p1 -b .weather
-%patch16 -p1 -b .projectm
-%patch17 -p1 -b .cflags
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1 -b .hdhomerun
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p1
+%patch6 -p0
# Prevent rerunning the autotools.
touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \
@@ -194,10 +148,12 @@
./configure \
--prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \
--libdir=%{_libdir} --datadir=%{_datadir} \
---enable-external-libraries --enable-goom \
+--enable-goom \
+--enable-external-ffmpeg --enable-external-python \
+--disable-libdts --disable-liba52 \
+--disable-dvdcss \
--disable-optimizations --disable-debug \
---disable-webserver \
-SVN_REV=26017 \
+SVN_REV=%{SVNVERSION} \
CPPFLAGS="-I/usr/include/ffmpeg" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
@@ -205,22 +161,18 @@
LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \
ASFLAGS=-fPIC
+# disable the following:
+# --enable-external-libraries
+# enumerate all the external libraries because the libdts/liba52 detection
+# is broken upstream: http://trac.xbmc.org/ticket/9277
+
make %{?_smp_mflags} VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-# remove the doc files from libdir, they should be put in the docdir
-rm $RPM_BUILD_ROOT/%{_libdir}/xbmc/copying.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/keymapping.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/LICENSE.GPL $RPM_BUILD_ROOT/%{_libdir}/xbmc/README.linux
-# remove bogus header file
-rm -f $RPM_BUILD_ROOT%{_libdir}/xbmc/visualisations/xbmc_vis.h
-
-# make Python files executable to keep rpmlint quiet
-# (spyce to be dropped from next xbmc release, so this can be dropped then)
-for i in run_spyceCGI.py run_spyceCmd.py run_spyceModpy.py spyceCGI.py spyceCmd.py spyce.py verchk.py
-do
- chmod +x $RPM_BUILD_ROOT%{_libdir}/xbmc/system/python/spyce/$i
-done
+# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
+rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -235,11 +187,33 @@
%{_bindir}/xbmc
%{_bindir}/xbmc-standalone
%{_libdir}/xbmc
+%{_datadir}/xbmc
%{_datadir}/xsessions/XBMC.desktop
%{_datadir}/applications/xbmc.desktop
-%{_datadir}/pixmaps/xbmc.png
+%{_datadir}/icons/hicolor/*/*/*.png
%changelog
+* Thu Jul 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.5.20100728svn32266%
+- Add gettext-devel to BuildRequires for autopoint
+
+* Wed Jul 28 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.4.20100728svn32266
+- Sync with latest Dharma branch (r32266)
+
+* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.3.20100719svn31991
+- Remove 24 patches which have been applied upstream, yay!
+- Rebased 2 patches: libdvd patch and hdhomerun patch for Dharma
+- Add some new patches, some of which have upstream trac tickets,
+ others need to
+- Renumber patches
+
+* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.2.20100719svn31991
+- Sync with Dharma branch
+
+* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.1.20100719svn31977
+- Major overhaul for 10.x version of XBMC
+- Fix file section for better FHS-compliance
+- Drop a lot of patches that have been upstreamed, and rebase others
+
* Fri May 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-19
- Add new BR for libmodplug-devel, expat-devel, libmicrohttpd-devel
in preparation for 10.x
13 years, 8 months
rpms/catalyst-kmod/F-13 catalyst-kmod.spec,1.6,1.7
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10181
Modified Files:
catalyst-kmod.spec
Log Message:
Re-enabling build for newest kernels
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-13/catalyst-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- catalyst-kmod.spec 28 Jul 2010 23:46:17 -0000 1.6
+++ catalyst-kmod.spec 28 Jul 2010 23:47:11 -0000 1.7
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
13 years, 8 months
